[infinispan-commits] Infinispan SVN: r1326 - in trunk/core/src: test/java/org/infinispan/replication and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2009-12-23 20:40:24 -0500 (Wed, 23 Dec 2009)
New Revision: 1326

Modified:
   trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
   trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
Log:
I hate java.util.Properties

Modified: trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java	2009-12-24 01:19:19 UTC (rev 1325)
+++ trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java	2009-12-24 01:40:24 UTC (rev 1326)
@@ -57,7 +57,8 @@
    }
 
    private ScheduledExecutorService buildAndConfigureScheduledExecutorService(String factoryName, Properties p, String componentName) throws Exception {
-      Properties props = new Properties(p); // defensive copy
+      Properties props = new Properties(); // defensive copy
+      if (p != null && !p.isEmpty()) props.putAll(p);
       ScheduledExecutorFactory f = (ScheduledExecutorFactory) Util.getInstance(factoryName);
       setComponentName(componentName, props);
       setDefaultThreadPrio(KnownComponentNames.getDefaultThreadPrio(componentName), props);

Modified: trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java	2009-12-24 01:19:19 UTC (rev 1325)
+++ trunk/core/src/test/java/org/infinispan/replication/ReplicationQueueTest.java	2009-12-24 01:40:24 UTC (rev 1326)
@@ -4,6 +4,7 @@
 import org.infinispan.config.Configuration;
 import org.infinispan.config.GlobalConfiguration;
 import org.infinispan.executors.ScheduledExecutorFactory;
+import org.infinispan.factories.KnownComponentNames;
 import org.infinispan.manager.CacheManager;
 import org.infinispan.remoting.ReplicationQueue;
 import org.infinispan.test.MultipleCacheManagersTest;
@@ -244,7 +245,8 @@
          for (Map.Entry<Object, Object> entry: myProps.entrySet())
             toCompareWith.setProperty((String) entry.getKey(), (String) entry.getValue()); 
          toCompareWith.setProperty("componentName", "replicationQueue-thread");
-         assert p.equals(toCompareWith);
+         toCompareWith.setProperty("threadPriority", "" + KnownComponentNames.getDefaultThreadPrio(KnownComponentNames.ASYNC_REPLICATION_QUEUE_EXECUTOR));
+         assert p.equals(toCompareWith) : "Expected " + p + " but was " + toCompareWith;
          methodCalled = true;
          return new ScheduledThreadPoolExecutor(1) {
             @Override