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

[Manik Surtani]

  User: msurtani
  Date: 06/11/16 11:51:53

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Fixed issues dealing with inactive regions.
  
  Revision  Changes    Path
  1.275     +17 -2     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.274
  retrieving revision 1.275
  diff -u -b -r1.274 -r1.275
  --- TreeCache.java	16 Nov 2006 15:40:19 -0000	1.274
  +++ TreeCache.java	16 Nov 2006 16:51:53 -0000	1.275
  @@ -36,6 +36,7 @@
   import org.jboss.cache.marshall.RegionNameConflictException;
   import org.jboss.cache.marshall.RegionNotFoundException;
   import org.jboss.cache.marshall.VersionAwareMarshaller;
  +import org.jboss.cache.marshall.InactiveRegionException;
   import org.jboss.cache.notifications.Notifier;
   import org.jboss.cache.optimistic.DataVersion;
   import org.jboss.cache.statetransfer.StateTransferManager;
  @@ -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.274 2006/11/16 15:40:19 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.275 2006/11/16 16:51:53 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -703,7 +704,21 @@
               MBeanServer server=(MBeanServer)servers.get(0);
               JmxConfigurator.registerChannel(channel, server, "JGroups:channel=" + channel.getChannelName() , true);
   */
  -            disp = new RpcDispatcher(channel, ml, this, this);
  +            disp = new RpcDispatcher(channel, ml, this, this)
  +            {
  +               public Object handle(Message m)
  +               {
  +                  Object retVal = null;
  +                  retVal = super.handle(m);
  +                  if (retVal instanceof InactiveRegionException)
  +                  {
  +                     log.warn("Attempt to call a method on an inactive region is being ignored.");
  +                     return null;
  +                  }
  +
  +                  return retVal;
  +               }
  +            };
               disp.setMarshaller(getMarshaller());
   
               setBuddyReplicationConfig(configuration.getBuddyReplicationConfig());