[jboss-cvs] JBossAS SVN: r63993 - in trunk/cluster/src/main/org/jboss: ha/framework/server and 1 other directory.

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

Author: jerrygauth
Date: 2007-07-12 09:23:17 -0400 (Thu, 12 Jul 2007)
New Revision: 63993

Modified:
   trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java
   trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java
Log:
JBAS-4276 cleanup

Modified: trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java
===================================================================
--- trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java	2007-07-12 13:10:40 UTC (rev 63992)
+++ trunk/cluster/src/main/org/jboss/cache/invalidation/bridges/JGCacheInvalidationBridge.java	2007-07-12 13:23:17 UTC (rev 63993)
@@ -35,7 +35,6 @@
 import org.jboss.ha.framework.interfaces.HAPartition;
 import org.jboss.ha.framework.interfaces.DistributedState;
 import org.jboss.ha.framework.interfaces.DistributedReplicantManager;
-import org.jboss.system.server.ServerConfigUtil;
 
 /**
  * JGroups implementation of a cache invalidation bridge
@@ -65,7 +64,6 @@
    
    // Attributes ----------------------------------------------------      
    
-   protected String partitionName = ServerConfigUtil.getDefaultPartitionName();
    /**
     * The ClusterPartition with which we are associated.
     */
@@ -118,7 +116,7 @@
    
    public String getPartitionName ()
    {
-      return this.partitionName;
+      return this.partition.getPartitionName();
    }
    
    public void setInvalidationManager (String objectName)
@@ -293,8 +291,7 @@
       }
       
       RPC_HANDLER_NAME = "DCacheBridge-" + this.bridgeName;
-
-      this.partitionName = partition.getPartitionName();       
+  
       this.ds = partition.getDistributedStateService ();
       this.drm = partition.getDistributedReplicantManager ();
       this.nodeName = partition.getNodeName();

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java	2007-07-12 13:10:40 UTC (rev 63992)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/FarmMemberService.java	2007-07-12 13:23:17 UTC (rev 63993)
@@ -31,7 +31,6 @@
 import org.jboss.ha.framework.interfaces.HAPartition;
 import org.jboss.system.server.ServerConfig;
 import org.jboss.system.server.ServerConfigLocator;
-import org.jboss.system.server.ServerConfigUtil;
 
 /**
  *
@@ -51,7 +50,6 @@
 public class FarmMemberService extends URLDeploymentScanner implements FarmMemberServiceMBean
 {
    protected HAPartition mClusterPartition = null;
-   protected String mBackgroundPartition = ServerConfigUtil.getDefaultPartitionName();
    private File mTempDirectory;
    private ClusterFileTransfer mFileTransfer;
 
@@ -63,7 +61,7 @@
 
    public String getPartitionName()
    {
-      return mBackgroundPartition;
+      return mClusterPartition.getPartitionName();
    }
 
    public HAPartition getHAPartition()
@@ -129,8 +127,6 @@
             throw new IllegalStateException("HAPartition property must be set before starting FarmMember service");
          }
          
-         mBackgroundPartition = mClusterPartition.getPartitionName();
-         
          log.debug( "registerRPCHandler" );
          mClusterPartition.registerRPCHandler( SERVICE_NAME, this );