[jboss-cvs] JBossAS SVN: r108563 - projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server.

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

Author: smarlow at redhat.com
Date: 2010-10-13 16:42:25 -0400 (Wed, 13 Oct 2010)
New Revision: 108563

Modified:
   projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
Log:
more debug logging

Modified: projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java
===================================================================
--- projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java	2010-10-13 20:10:37 UTC (rev 108562)
+++ projects/cluster/ha-server-api/trunk/src/main/java/org/jboss/ha/framework/server/HASingletonImpl.java	2010-10-13 20:42:25 UTC (rev 108563)
@@ -170,12 +170,12 @@
       
       boolean isMaster = this.master.get();
 
-      if(log.isDebugEnabled())
+      if( log.isDebugEnabled())
       {
 
          this.log.debug("partitionTopologyChanged, isElectedNewMaster=" + isElectedNewMaster + ", isMasterNode=" +
-            isMaster + ", viewID=" + newViewId + ", partition=" + getHAPartition().getPartitionName() +
-            ", electionPolicy=" + (electionPolicy!=null?electionPolicy.getClass().getName():"none"));
+            isMaster + ", viewID=" + newViewId + ", partition=" + getHAPartition().getPartitionName()
+            );
       }
       
       if (isElectedNewMaster)
@@ -204,14 +204,21 @@
 
    private boolean elected()
    {
+      boolean result;
       if (this.electionPolicy == null)
       {
-         return this.isDRMMasterReplica();
+         result = this.isDRMMasterReplica();
       }
-      
-      ClusterNode electedNode = this.election();
-      
-      return (electedNode != null) ? electedNode.equals(this.getHAPartition().getClusterNode()) : false;
+      else {
+         ClusterNode electedNode = this.election();
+         result = (electedNode != null) ? electedNode.equals(this.getHAPartition().getClusterNode()) : false;
+      }
+      if( log.isDebugEnabled())
+      {
+         log.debug("election result =" + result + ", electionPolicy=" +
+         (electionPolicy != null? electionPolicy.getClass().getName():"DistributedReplicantManager"));
+      }
+      return result;
    }
    
    private ClusterNode election()