Mailing-List: contact commits-help@camel.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@camel.apache.org
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: acosentino@apache.org
To: commits@camel.apache.org
Message-Id: <2292e4f7341643f79d596c7ad2deb3f1@git.apache.org>
Subject: camel git commit: CAMEL-9950: Camel-Websocket: NPE in case minThreads,
 maxThreads and getThreadPool equals to null
Date: Fri,  6 May 2016 12:18:03 +0000 (UTC)
archived-at: Fri, 06 May 2016 12:18:05 -0000

Repository: camel
Updated Branches:
  refs/heads/master 5ae785204 -> 8fb2303be


CAMEL-9950: Camel-Websocket: NPE in case minThreads, maxThreads and getThreadPool equals to null


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/8fb2303b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/8fb2303b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/8fb2303b

Branch: refs/heads/master
Commit: 8fb2303be6699a794103f051a099fb71580d5db1
Parents: 5ae7852
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Fri May 6 14:06:09 2016 +0200
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri May 6 14:06:09 2016 +0200

----------------------------------------------------------------------
 components/camel-websocket/src/main/docs/websocket.adoc      | 8 +++++---
 .../apache/camel/component/websocket/WebsocketComponent.java | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/8fb2303b/components/camel-websocket/src/main/docs/websocket.adoc
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/docs/websocket.adoc b/components/camel-websocket/src/main/docs/websocket.adoc
index ff0abcf..1a59752 100644
--- a/components/camel-websocket/src/main/docs/websocket.adoc
+++ b/components/camel-websocket/src/main/docs/websocket.adoc
@@ -33,6 +33,7 @@ Websocket Options
 ^^^^^^^^^^^^^^^^^
 
 
+
 // component options: START
 The Jetty Websocket component supports 12 options which are listed below.
 
@@ -48,9 +49,9 @@ The Jetty Websocket component supports 12 options which are listed below.
 | sslPassword | String | The password when using SSL.
 | sslKeystore | String | The path to the keystore.
 | enableJmx | boolean | If this option is true Jetty JMX support will be enabled for this endpoint. See Jetty JMX support for more details.
-| minThreads | Integer | To set a value for minimum number of threads in server thread pool.
-| maxThreads | Integer | To set a value for maximum number of threads in server thread pool.
-| threadPool | ThreadPool | To use a custom thread pool for the server.
+| minThreads | Integer | To set a value for minimum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+| maxThreads | Integer | To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
+| threadPool | ThreadPool | To use a custom thread pool for the server. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
 | sslContextParameters | SSLContextParameters | To configure security using SSLContextParameters
 | socketFactory | Map | To configure a map which contains custom WebSocketFactory for sub protocols. The key in the map is the sub protocol. The default key is reserved for the default implementation.
 |=======================================================================
@@ -59,6 +60,7 @@ The Jetty Websocket component supports 12 options which are listed below.
 
 
+
 // endpoint options: START
 The Jetty Websocket component supports 20 endpoint options which are listed below:
 

http://git-wip-us.apache.org/repos/asf/camel/blob/8fb2303b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
----------------------------------------------------------------------
diff --git a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
index e6c6c8f..0e9d1d9 100644
--- a/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
+++ b/components/camel-websocket/src/main/java/org/apache/camel/component/websocket/WebsocketComponent.java
@@ -688,7 +688,7 @@ public class WebsocketComponent extends UriEndpointComponent {
     }
 
     /**
-     * To set a value for minimum number of threads in server thread pool.
+     * To set a value for minimum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
      */
     public void setMinThreads(Integer minThreads) {
         this.minThreads = minThreads;
@@ -699,7 +699,7 @@ public class WebsocketComponent extends UriEndpointComponent {
     }
 
     /**
-     * To set a value for maximum number of threads in server thread pool.
+     * To set a value for maximum number of threads in server thread pool. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
      */
     public void setMaxThreads(Integer maxThreads) {
         this.maxThreads = maxThreads;
@@ -710,7 +710,7 @@ public class WebsocketComponent extends UriEndpointComponent {
     }
 
     /**
-     * To use a custom thread pool for the server.
+     * To use a custom thread pool for the server. MaxThreads/minThreads or threadPool fields are required due to switch to Jetty9.
      */
     public void setThreadPool(ThreadPool threadPool) {
         this.threadPool = threadPool;