svn commit: r795090 - /webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java

[az...@apache.org]

Author: azeez
Date: Fri Jul 17 14:01:14 2009
New Revision: 795090

URL: http://svn.apache.org/viewvc?rev=795090&view=rev
Log:
Removing synchornization since this is causing a deadlock & failure at the Tribes level


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

Modified: webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java?rev=795090&r1=795089&r2=795090&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java (original)
+++ webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/tribes/MembershipManager.java Fri Jul 17 14:01:14 2009
@@ -125,10 +125,10 @@
      * @param member The new member that joined the cluster
      * @return true  If the member was added to the <code>members</code> array; false, otherwise.
      */
-    public synchronized boolean memberAdded(Member member) {
+    public boolean memberAdded(Member member) {
 
-        if(log.isDebugEnabled()){
-            log.debug("members.contains(member) =" + members.contains(member) );
+        if (log.isDebugEnabled()) {
+            log.debug("members.contains(member) =" + members.contains(member));
             log.debug("Is in my domain: " + TribesUtil.isInDomain(member, domain));
         }
 
@@ -177,12 +177,12 @@
 
                     // Once a response is received from the WKA member to the MEMBER_LIST message,
                     // if it does not belong to this domain, simply remove it from the members
-                    if(responses != null && responses.length > 0 && responses[0] != null){
+                    if (responses != null && responses.length > 0 && responses[0] != null) {
                         Member source = responses[0].getSource();
-                        if(!TribesUtil.areInSameDomain(source, member)){
-                            if(log.isDebugEnabled()){
+                        if (!TribesUtil.areInSameDomain(source, member)) {
+                            if (log.isDebugEnabled()) {
                                 log.debug("WKA Member " + TribesUtil.getName(source) +
-                                          " does not belong to local domain " + new String(domain)+
+                                          " does not belong to local domain " + new String(domain) +
                                           ". Hence removing it from the list.");
                             }
                             members.remove(member);
@@ -260,7 +260,7 @@
             throw new RemoteProcessException(errMsg, e);
         }
     }
-    
+
     private boolean isLocalMemberInitialized() {
         if (configContext == null) {
             return false;
@@ -275,7 +275,7 @@
      *
      * @param member The member that left the cluster
      */
-    public synchronized void memberDisappeared(Member member) {
+    public void memberDisappeared(Member member) {
         members.remove(member);
 
         // Is this an application domain member?
@@ -289,7 +289,7 @@
      *
      * @return list of current members
      */
-    public synchronized Member[] getMembers() {
+    public Member[] getMembers() {
         return members.toArray(new Member[members.size()]);
     }
 
@@ -298,7 +298,7 @@
      *
      * @return The member that has been alive for the longest time
      */
-    public synchronized Member getLongestLivingMember() {
+    public Member getLongestLivingMember() {
         Member longestLivingMember = null;
         if (members.size() > 0) {
             Member member0 = members.get(0);
@@ -319,7 +319,7 @@
      *
      * @return A random member from the list of current members
      */
-    public synchronized Member getRandomMember() {
+    public Member getRandomMember() {
         if (members.size() == 0) {
             return null;
         }