[infinispan-commits] Infinispan SVN: r1331 - trunk/core/src/test/java/org/infinispan/test/fwk.

[infinispan-commits at lists.jboss.org]

Author: sannegrinovero
Date: 2009-12-29 05:40:28 -0500 (Tue, 29 Dec 2009)
New Revision: 1331

Modified:
   trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
Log:
test fw: amendTransport won't clear already set transport properties

Modified: trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-12-29 09:13:56 UTC (rev 1330)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java	2009-12-29 10:40:28 UTC (rev 1331)
@@ -178,6 +178,10 @@
    private static void amendTransport(GlobalConfiguration configuration) {
       if (configuration.getTransportClass() != null) { //this is local
          Properties newTransportProps = new Properties();
+         Properties previousSettings = configuration.getTransportProperties();
+         if (previousSettings!=null) {
+            newTransportProps.putAll(previousSettings);
+         }
          newTransportProps.put(JGroupsTransport.CONFIGURATION_STRING, JGroupsConfigBuilder.getJGroupsConfig());
          configuration.setTransportProperties(newTransportProps);
       }