[infinispan-commits] Infinispan SVN: r1889 - trunk/server/websocket/src/main/java/org/infinispan/server/websocket.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Thu Jun 3 03:59:24 EDT 2010
Author: galder.zamarreno at jboss.com
Date: 2010-06-03 03:59:24 -0400 (Thu, 03 Jun 2010)
New Revision: 1889
Modified:
trunk/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: trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java
===================================================================
--- trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java 2010-06-03 07:52:39 UTC (rev 1888)
+++ trunk/server/websocket/src/main/java/org/infinispan/server/websocket/WebSocketServer.java 2010-06-03 07:59:24 UTC (rev 1889)
@@ -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 ?
@@ -171,4 +176,4 @@
}
}
}
-}
\ No newline at end of file
+}
More information about the infinispan-commits
mailing list