[infinispan-commits] Infinispan SVN: r1888 - branches/4.1.x/server/websocket/src/main/java/org/infinispan/server/websocket.

[infinispan-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2010-06-03 03:52:39 -0400 (Thu, 03 Jun 2010)
New Revision: 1888

Modified:
   branches/4.1.x/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
Log:
[ISPN-476] (Enable tcp no delay by default and make it configurable in servers) Fix regression on web socket server.

Modified: branches/4.1.x/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
===================================================================
--- branches/4.1.x/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java	2010-06-02 16:39:07 UTC (rev 1887)
+++ branches/4.1.x/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java	2010-06-03 07:52:39 UTC (rev 1888)
@@ -28,6 +28,7 @@
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
@@ -77,8 +78,12 @@
    }
 
    @Override
-   public void start(String host, int port, EmbeddedCacheManager cacheManager, int masterThreads, int workerThreads,
-                     int idleTimeout) {
+   public void start(Properties properties, EmbeddedCacheManager cacheManager) {
+      String host = properties.getProperty("infinispan.server.host");
+      int port = Integer.parseInt(properties.getProperty("infinispan.server.port"));
+      int masterThreads = Integer.parseInt(properties.getProperty("infinispan.server.master.threads"));
+      int workerThreads = Integer.parseInt(properties.getProperty("infinispan.server.worker.threads"));
+
       InetSocketAddress address = new InetSocketAddress(host, port);
 
       Executor masterExecutor =
@@ -88,7 +93,7 @@
       Executor workerExecutor =
          workerThreads == 0 ?
             Executors.newCachedThreadPool():
-            Executors.newFixedThreadPool(masterThreads);
+            Executors.newFixedThreadPool(workerThreads);
 
       NioServerSocketChannelFactory factory =
          workerThreads == 0 ?