[jboss-cvs] JBossCache/src/org/jboss/cache/buddyreplication ...
Manik Surtani
msurtani at jboss.com
Fri Aug 25 10:10:07 EDT 2006
User: msurtani
Date: 06/08/25 10:10:07
Modified: src/org/jboss/cache/buddyreplication BuddyManager.java
Log:
More work on JBCACHE-734
Revision Changes Path
1.42 +8 -12 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.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- BuddyManager.java 16 Aug 2006 10:52:50 -0000 1.41
+++ BuddyManager.java 25 Aug 2006 14:10:07 -0000 1.42
@@ -16,7 +16,6 @@
import org.jboss.cache.Fqn;
import org.jboss.cache.TreeCache;
import org.jboss.cache.lock.TimeoutException;
-import org.jboss.cache.marshall.JBCMethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
import org.jboss.cache.marshall.MethodDeclarations;
import org.jboss.cache.marshall.Region;
@@ -24,9 +23,9 @@
import org.jboss.cache.marshall.VersionAwareMarshaller;
import org.jboss.cache.statetransfer.StateTransferManager;
import org.jboss.cache.xml.XmlHelper;
-import org.jgroups.View;
import org.jgroups.Address;
-import org.jgroups.blocks.MethodCall;
+import org.jgroups.View;
+import org.jboss.cache.marshall.MethodCall;
import org.jgroups.stack.IpAddress;
import org.w3c.dom.Element;
@@ -468,18 +467,15 @@
* (e.g., /_buddy_backup_/my_host:7890/) rather than the root (/).
* Called by BaseRPCInterceptor to transform method calls before broadcasting.
*/
- public JBCMethodCall transformFqns(JBCMethodCall call)
+ public MethodCall transformFqns(MethodCall call)
{
return transformFqns(call, call.getMethodId() != MethodDeclarations.dataGravitationCleanupMethod_id);
}
- public JBCMethodCall transformFqns(JBCMethodCall call, boolean transformForCurrentCall)
+ public MethodCall transformFqns(MethodCall call, boolean transformForCurrentCall)
{
if (call != null && call.getArgs() != null)
{
- JBCMethodCall call2 = new JBCMethodCall(call.getMethod(), (Object[]) call.getArgs().clone(), call.getMethodId());
-// call2.setId(call.getId());
-// call2.setMethod(call.getMethod());
-// call2.setArgs((Object[]) call.getArgs().clone());
+ MethodCall call2 = new MethodCall(call.getMethod(), call.getArgs().clone(), call.getMethodId());
handleArgs(call2.getArgs(), transformForCurrentCall);
return call2;
}
@@ -686,16 +682,16 @@
{
for (int i = 0; i < args.length; i++)
{
- if (args[i] instanceof JBCMethodCall)
+ if (args[i] instanceof MethodCall)
{
- JBCMethodCall call = (JBCMethodCall) args[i];
+ MethodCall call = (MethodCall) args[i];
boolean transformFqns = true;
if (call.getMethodId() == MethodDeclarations.dataGravitationCleanupMethod_id)
{
transformFqns = false;
}
- args[i] = transformFqns((JBCMethodCall) args[i], transformFqns);
+ args[i] = transformFqns((MethodCall) args[i], transformFqns);
}
if (args[i] instanceof List && args[i] != null)
More information about the jboss-cvs-commits
mailing list