axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From az...@apache.org
Subject svn commit: r673418 - in /webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes: TribesClusterManager.java WkaBasedMembershipScheme.java
Date Wed, 02 Jul 2008 15:26:14 GMT
Author: azeez
Date: Wed Jul  2 08:26:13 2008
New Revision: 673418

URL: http://svn.apache.org/viewvc?rev=673418&view=rev
Log:
Minor code improvements
Removing a thread.sleep, may need it on EC2 however. May be I should introduce a parameter
in the axis2.xml file


Modified:
    webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
    webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java

Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java?rev=673418&r1=673417&r2=673418&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
(original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/TribesClusterManager.java
Wed Jul  2 08:26:13 2008
@@ -75,7 +75,7 @@
 
     private HashMap<String, Parameter> parameters;
     private ManagedChannel channel;
-    private RpcChannel initRpcChannel;
+    private RpcChannel rpcInitChannel;
     private RpcChannel membershipRpcChannel;
     private ConfigurationContext configurationContext;
     private ChannelListener channelListener;
@@ -153,7 +153,7 @@
         // RpcChannel is a ChannelListener. When the reply to a particular request comes
back, it
         // picks it up. Each RPC is given a UUID, hence can correlate the request-response
pair
         rpcInitRequestHandler = new RpcInitializationRequestHandler(configurationContext);
-        initRpcChannel =
+        rpcInitChannel =
                 new RpcChannel(TribesUtil.getRpcInitChannelId(domain),
                                channel, rpcInitRequestHandler);
         if (log.isDebugEnabled()) {
@@ -412,7 +412,7 @@
                 if (!sentMembersList.contains(memberHost)) {
                     Response[] responses;
                     do {
-                        responses = initRpcChannel.send(new Member[]{member},
+                        responses = rpcInitChannel.send(new Member[]{member},
                                                         command,
                                                         RpcChannel.FIRST_REPLY,
                                                         Channel.SEND_OPTIONS_ASYNCHRONOUS,
@@ -495,7 +495,7 @@
         log.debug("Enter: TribesClusterManager::shutdown");
         if (channel != null) {
             try {
-                channel.removeChannelListener(initRpcChannel);
+                channel.removeChannelListener(rpcInitChannel);
                 channel.removeChannelListener(channelListener);
                 channel.stop(Channel.DEFAULT);
             } catch (ChannelException e) {

Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java?rev=673418&r1=673417&r2=673418&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
(original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/WkaBasedMembershipScheme.java
Wed Jul  2 08:26:13 2008
@@ -376,10 +376,10 @@
         if (primaryMembershipManager.getMembers().length > 0) {
             log.info("Sending JOIN message to WKA members...");
             org.apache.catalina.tribes.Member[] wkaMembers = primaryMembershipManager.getMembers();
// The well-known members
-            try {
+            /*try {
                 Thread.sleep(3000); // Wait for sometime so that the WKA members can receive
the MEMBER_LIST message, if they have just joined the group
             } catch (InterruptedException ignored) {
-            }
+            }*/   //TODO: #### Need to double check whether this sleep is necessary
             Response[] responses = null;
             do {
                 try {



Mime
View raw message