Repository: camel Updated Branches: refs/heads/master 74e75a537 -> 83139cffe
Typo Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/83139cff Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/83139cff Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/83139cff Branch: refs/heads/master Commit: 83139cffeb48cb1596137b8c91dfbadd86d38108 Parents: 74e75a5 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Sep 4 12:22:06 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Sep 4 12:22:06 2016 +0200 ---------------------------------------------------------------------- components/camel-websocket/src/main/docs/websocket-component.adoc | 2 +- .../org/apache/camel/component/websocket/WebsocketEndpoint.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/83139cff/components/camel-websocket/src/main/docs/websocket-component.adoc ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/docs/websocket-component.adoc b/components/camel-websocket/src/main/docs/websocket-component.adoc index 2659ef0..9b31bd3 100644 --- a/components/camel-websocket/src/main/docs/websocket-component.adoc +++ b/components/camel-websocket/src/main/docs/websocket-component.adoc @@ -86,7 +86,7 @@ The Jetty Websocket component supports 21 endpoint options which are listed belo | sessionSupport | consumer | false | boolean | Whether to enable session support which enables HttpSession for each http request. | staticResources | consumer | | String | Set a resource path for static resources (such as .html files etc). The resources can be loaded from classpath if you prefix with classpath: otherwise the resources is loaded from file system or from JAR files. For example to load from root classpath use classpath:. or classpath:WEB-INF/static If not configured (eg null) then no static resource is in use. | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. -| sendTimeout | producer | 30000 | Integer | Timeout in millise when sending to a websocket channel. The default timeout is 30000 (30 seconds). +| sendTimeout | producer | 30000 | Integer | Timeout in millis when sending to a websocket channel. The default timeout is 30000 (30 seconds). | sendToAll | producer | | Boolean | To send to all websocket subscribers. Can be used to configure on endpoint level instead of having to use the WebsocketConstants.SEND_TO_ALL header on the message. | bufferSize | advanced | 8192 | Integer | Set the buffer size of the websocketServlet which is also the max frame byte size (default 8192) | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange http://git-wip-us.apache.org/repos/asf/camel/blob/83139cff/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java index 5ac923e..fb28c2a 100644 --- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java +++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketEndpoint.java @@ -195,7 +195,7 @@ public class WebsocketEndpoint extends DefaultEndpoint { } /** - * Timeout in millise when sending to a websocket channel. + * Timeout in millis when sending to a websocket channel. * The default timeout is 30000 (30 seconds). */ public void setSendTimeout(Integer sendTimeout) {