svn commit: r1080531 - in /axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes: ChannelSender.java TribesClusteringAgent.java

[azeez]

Author: azeez
Date: Fri Mar 11 11:38:01 2011
New Revision: 1080531

URL: http://svn.apache.org/viewvc?rev=1080531&view=rev
Log:
1. Enabled channel heartbeat
2. Synchronizing channel send since otherwise it causes failures at Tribes level

Modified:
    
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
    
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java

Modified: 
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java?rev=1080531&r1=1080530&r2=1080531&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/ChannelSender.java
 Fri Mar 11 11:38:01 2011
@@ -49,7 +49,7 @@ public class ChannelSender implements Me
         this.synchronizeAllMembers = synchronizeAllMembers;
     }
 
-    public void sendToGroup(ClusteringCommand msg,
+    public synchronized void sendToGroup(ClusteringCommand msg,
                             MembershipManager membershipManager,
                             int additionalOptions) throws ClusteringFault {
         if (channel == null) {

Modified: 
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java?rev=1080531&r1=1080530&r2=1080531&view=diff
==============================================================================
--- 
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusteringAgent.java
 Fri Mar 11 11:38:01 2011
@@ -152,6 +152,7 @@ public class TribesClusteringAgent imple
         primaryMembershipManager = new MembershipManager(configurationContext);
 
         channel = new GroupChannel();
+        channel.setHeartbeat(true);
         channelSender = new ChannelSender(channel, primaryMembershipManager, 
synchronizeAllMembers());
         axis2ChannelListener =
                 new Axis2ChannelListener(configurationContext, 
configurationManager, contextManager);