[jboss-cvs] JBossCache/src/org/jboss/cache ...

[Manik Surtani]

  User: msurtani
  Date: 06/12/18 07:51:36

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Reinstated InactiveRegionAwareRpcDispatcher
  
  Revision  Changes    Path
  1.294     +9 -3      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.293
  retrieving revision 1.294
  diff -u -b -r1.293 -r1.294
  --- TreeCache.java	15 Dec 2006 14:19:57 -0000	1.293
  +++ TreeCache.java	18 Dec 2006 12:51:36 -0000	1.294
  @@ -29,6 +29,7 @@
   import org.jboss.cache.lock.LockingException;
   import org.jboss.cache.lock.NodeLock;
   import org.jboss.cache.lock.TimeoutException;
  +import org.jboss.cache.marshall.InactiveRegionAwareRpcDispatcher;
   import org.jboss.cache.marshall.MethodCall;
   import org.jboss.cache.marshall.MethodCallFactory;
   import org.jboss.cache.marshall.MethodDeclarations;
  @@ -94,7 +95,7 @@
    * @author <a href="mailto:manik at jboss.org">Manik Surtani (manik at jboss.org)</a>
    * @author Brian Stansberry
    * @author Daniel Huang (dhuang at jboss.org)
  - * @version $Id: TreeCache.java,v 1.293 2006/12/15 14:19:57 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.294 2006/12/18 12:51:36 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -692,8 +693,13 @@
                           MBeanServer server=(MBeanServer)servers.get(0);
                           JmxConfigurator.registerChannel(channel, server, "JGroups:channel=" + channel.getChannelName() , true);
               */
  -            // disp = new InactiveRegionAwareRpcDispatcher(channel, ml, this, this);
  -            disp = new RpcDispatcher(channel, ml, this, this);
  +
  +            // always use the InactiveRegionAwareRpcDispatcher - exceptions due to regions not being active should not propagate to remote
  +            // nodes as errors. - Manik
  +            disp = new InactiveRegionAwareRpcDispatcher(channel, ml, this, this);
  +//            disp = new RpcDispatcher(channel, ml, this, this);
  +
  +
               disp.setMarshaller(getMarshaller());
   
               setBuddyReplicationConfig(configuration.getBuddyReplicationConfig());