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

[infinispan-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2010-03-26 10:53:45 -0400 (Fri, 26 Mar 2010)
New Revision: 1626

Modified:
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
   trunk/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
Log:
[ISPN-379] (JGroupsChannelLookup should take in Properties created from props set on the transport)

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java	2010-03-26 12:00:00 UTC (rev 1625)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsChannelLookup.java	2010-03-26 14:53:45 UTC (rev 1626)
@@ -2,6 +2,8 @@
 
 import org.jgroups.Channel;
 
+import java.util.Properties;
+
 /**
  * A hook to pass in a JGroups channel.  Implementations need to provide a public no-arg constructor as instances are
  * created via reflection.
@@ -10,9 +12,22 @@
  * @since 4.0
  */
 public interface JGroupsChannelLookup {
-   Channel getJGroupsChannel();
+   /**
+    * Retrieves a JGroups channel.  Passes in all of the properties used to configure the channel.
+    * @param p properties
+    * @return a JGroups channel
+    */
+   Channel getJGroupsChannel(Properties p);
 
+   /**
+    * @return true if the JGroupsTransport should start and connect the channel before using it; false if the transport
+    * should assume that the channel is connected and started.
+    */
    boolean shouldStartAndConnect();
 
+   /**
+    * @return true if the JGroupsTransport should stop and disconnect the channel once it is done with it; false if
+    * the channel is to be left open/connected.
+    */
    boolean shouldStopAndDisconnect();
 }

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-03-26 12:00:00 UTC (rev 1625)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java	2010-03-26 14:53:45 UTC (rev 1626)
@@ -236,7 +236,7 @@
 
             try {
                JGroupsChannelLookup lookup = (JGroupsChannelLookup) Util.getInstance(channelLookupClassName);
-               channel = lookup.getJGroupsChannel();
+               channel = lookup.getJGroupsChannel(props);
                startChannel = lookup.shouldStartAndConnect();
                stopChannel = lookup.shouldStopAndDisconnect();
             } catch (ClassCastException e) {

Modified: trunk/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java	2010-03-26 12:00:00 UTC (rev 1625)
+++ trunk/core/src/test/java/org/infinispan/remoting/jgroups/ChannelLookupTest.java	2010-03-26 14:53:45 UTC (rev 1626)
@@ -54,7 +54,7 @@
             EasyMock.replay(mockChannel, a, ps);           
         }
 
-        public Channel getJGroupsChannel() {
+        public Channel getJGroupsChannel(Properties p) {
             return mockChannel;
         }