[jboss-cvs] JBossAS SVN: r108204 - in projects/cluster/ha-server-ispn/trunk: src/main/java/org/jboss/ha/ispn and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: pferraro
Date: 2010-09-17 10:30:00 -0400 (Fri, 17 Sep 2010)
New Revision: 108204

Modified:
   projects/cluster/ha-server-ispn/trunk/pom.xml
   projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
Log:
Always disable strict peer to peer.

Modified: projects/cluster/ha-server-ispn/trunk/pom.xml
===================================================================
--- projects/cluster/ha-server-ispn/trunk/pom.xml	2010-09-17 13:27:09 UTC (rev 108203)
+++ projects/cluster/ha-server-ispn/trunk/pom.xml	2010-09-17 14:30:00 UTC (rev 108204)
@@ -32,7 +32,7 @@
   </scm>
   
   <properties>
-    <version.infinispan>4.1.0.FINAL</version.infinispan>
+    <version.infinispan>4.2.0-SNAPSHOT</version.infinispan>
     <version.jta>1.0.1.GA</version.jta>
     <version.junit>4.8.1</version.junit>
     <version.easymock>3.0</version.easymock>

Modified: projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java
===================================================================
--- projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2010-09-17 13:27:09 UTC (rev 108203)
+++ projects/cluster/ha-server-ispn/trunk/src/main/java/org/jboss/ha/ispn/DefaultCacheContainerFactory.java	2010-09-17 14:30:00 UTC (rev 108204)
@@ -62,10 +62,15 @@
    public EmbeddedCacheManager createCacheContainer(CacheContainerConfiguration configuration)
    {
       GlobalConfiguration globalConfiguration = configuration.getGlobalConfiguration();
+      globalConfiguration.setStrictPeerToPeer(false);
       Properties properties = globalConfiguration.getTransportProperties();
-      properties.put(CHANNEL_FACTORY, this.channelFactory);
-      properties.setProperty(CHANNEL_ID, globalConfiguration.getClusterName());
-      properties.setProperty(JGroupsTransport.CHANNEL_LOOKUP, ChannelFactoryChannelLookup.class.getName());
+      
+      if (!properties.containsKey(JGroupsTransport.CHANNEL_LOOKUP))
+      {
+         properties.put(CHANNEL_FACTORY, this.channelFactory);
+         properties.setProperty(CHANNEL_ID, globalConfiguration.getClusterName());
+         properties.setProperty(JGroupsTransport.CHANNEL_LOOKUP, ChannelFactoryChannelLookup.class.getName());
+      }
 
       EmbeddedCacheManager manager = new DefaultCacheManager(globalConfiguration, configuration.getDefaultConfiguration(), false);