[infinispan-commits] Infinispan SVN: r1774 - trunk/core/src/main/java/org/infinispan/factories.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-05-11 07:46:59 -0400 (Tue, 11 May 2010)
New Revision: 1774

Modified:
   trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
Log:
[ISPN-435] (NamedExecutorsFactory incorrectly uses java.util.Properties causing properties to be set to their defaults)

Modified: trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java	2010-05-11 11:25:09 UTC (rev 1773)
+++ trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java	2010-05-11 11:46:59 UTC (rev 1774)
@@ -49,6 +49,7 @@
 
    private ExecutorService buildAndConfigureExecutorService(String factoryName, Properties p, String componentName) throws Exception {
       Properties props = new Properties(p); // defensive copy
+      if (p != null && !p.isEmpty()) props.putAll(p);
       ExecutorFactory f = (ExecutorFactory) Util.getInstance(factoryName);
       setComponentName(componentName, props);
       setDefaultThreads(KnownComponentNames.getDefaultThreads(componentName), props);