[jboss-cvs] JBossCache/src/org/jboss/cache/buddyreplication ...
Manik Surtani
msurtani at jboss.com
Wed Jan 17 12:21:37 EST 2007
User: msurtani
Date: 07/01/17 12:21:37
Modified: src/org/jboss/cache/buddyreplication BuddyManager.java
Log:
Removed unused Marshaller methods
Revision Changes Path
1.61 +1 -7 JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: BuddyManager.java
===================================================================
RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/buddyreplication/BuddyManager.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- BuddyManager.java 17 Jan 2007 14:13:07 -0000 1.60
+++ BuddyManager.java 17 Jan 2007 17:21:37 -0000 1.61
@@ -16,7 +16,6 @@
import org.jboss.cache.config.BuddyReplicationConfig;
import org.jboss.cache.config.BuddyReplicationConfig.BuddyLocatorConfig;
import org.jboss.cache.lock.TimeoutException;
-import org.jboss.cache.marshall.Marshaller;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
@@ -407,11 +406,6 @@
// Integrate state transfer from the data owner of the buddy group
Fqn integrationBase = new Fqn(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN,
newGroup.getGroupName());
- Marshaller marshaller = null;
- if (cache.getConfiguration().isUseRegionBasedMarshalling())
- {
- marshaller = cache.getMarshaller();
- }
StateTransferManager stateMgr = cache.getStateTransferManager();
@@ -420,7 +414,7 @@
Map.Entry entry = (Map.Entry) it.next();
Fqn fqn = (Fqn) entry.getKey();
String fqnS = fqn.toString();
- if (marshaller == null || !marshaller.isInactive(fqn.toString()))
+ if (!cache.getRegionManager().isInactive(fqnS))
{
//ClassLoader cl = (marshaller == null) ? null : marshaller.getClassLoader(fqnS);
Fqn integrationRoot = new Fqn(integrationBase, fqn);
More information about the jboss-cvs-commits
mailing list