From: Manik S. <msu...@jb...> - 2005-11-03 12:45:52
|
User: msurtani Date: 05/11/03 07:45:48 Modified: src/org/jboss/cache TreeCache.java Log: Removed Replicatable references Revision Changes Path 1.76 +7 -59 JBossCache/src/org/jboss/cache/TreeCache.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TreeCache.java =================================================================== RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCache.java,v retrieving revision 1.75 retrieving revision 1.76 diff -u -b -r1.75 -r1.76 --- TreeCache.java 3 Nov 2005 12:39:53 -0000 1.75 +++ TreeCache.java 3 Nov 2005 12:45:48 -0000 1.76 @@ -62,7 +62,7 @@ * @author Ben Wang * @author <a href="mailto:ma...@jb...">Manik Surtani (ma...@jb...)</a> * @author Brian Stansberry - * @version $Id: TreeCache.java,v 1.75 2005/11/03 12:39:53 msurtani Exp $ + * @version $Id: TreeCache.java,v 1.76 2005/11/03 12:45:48 msurtani Exp $ * <p/> */ public class TreeCache extends ServiceMBeanSupport implements TreeCacheMBean, Cloneable, MembershipListener { @@ -164,16 +164,6 @@ */ protected Interceptor interceptor_chain=null; - - /** - * Interceptor which handles invocations of {@link #_replicate(MethodCall)}. Any such method - * invocation is forwarded to the invoke_handler.<br/> - * This will go away in the future, as we're moving replication functionality into the - * ReplicationInterceptor itself - */ - protected Replicatable replication_handler=null; - - /** Method to acquire a TransactionManager. By default we use JBossTransactionManagerLookup. Has * to be set before calling {@link #start()} */ protected TransactionManagerLookup tm_lookup=null; @@ -1105,16 +1095,6 @@ return this; } - - - public void setReplicationHandler(Replicatable handler) { - replication_handler=handler; - } - - public Replicatable getReplicationHandler() { - return replication_handler; - } - /** * Fetch the group state from the current coordinator. If successful, this will trigger setState(). */ @@ -3693,22 +3673,13 @@ */ public Object _replicate(MethodCall method_call) throws Throwable { - try { + try + { ActionOrigin.setRemote(); -// if (isNodeLockingOptimistic() || getCacheModeInternal() == INVALIDATION_ASYNC || getCacheModeInternal() == INVALIDATION_SYNC) -// { return invokeMethod( method_call ); -// } -// else if(replication_handler != null) -// { -// return replication_handler.replicate(method_call); -// } -// else -// { -// throw new UnsupportedOperationException("no replication handler is installed, and node locking mode is pessimistic"); -// } } - finally { + finally + { ActionOrigin.setLocal(); } } @@ -3717,29 +3688,6 @@ { Iterator it = method_calls.iterator(); while (it.hasNext()) _replicate((MethodCall) it.next()); -// -// try { -// ActionOrigin.setRemote(); -// if (isNodeLockingOptimistic()) -// { -// Iterator it = method_calls.iterator(); -// while (it.hasNext()) -// { -// _replicate( (MethodCall) it.next() ); -// } -// } -// else if(replication_handler != null) -// { -// replication_handler.replicate(method_calls); -// } -// else -// { -// throw new UnsupportedOperationException("no replication handler is installed, and node locking mode is pessimistic"); -// } -// } -// finally { -// ActionOrigin.setLocal(); -// } } public void _releaseAllLocks(Fqn fqn) { |