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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/05 00:04:47

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Always register cache; there is no other way to do it
  
  Revision  Changes    Path
  1.261     +3 -7      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.260
  retrieving revision 1.261
  diff -u -b -r1.260 -r1.261
  --- TreeCache.java	31 Oct 2006 15:05:10 -0000	1.260
  +++ TreeCache.java	5 Nov 2006 05:04:47 -0000	1.261
  @@ -91,7 +91,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.260 2006/10/31 15:05:10 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.261 2006/11/05 05:04:47 bstansberry Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -256,8 +256,6 @@
         this.stateTransferManager = manager;
      }
   
  -   private boolean isStandalone = false;
  -
      private long stateFetchTimeout;
   
      private ThreadLocal<InvocationContext> invocationContextContainer = new ThreadLocal<InvocationContext>();
  @@ -678,15 +676,13 @@
         // build interceptor chain
         interceptor_chain = new InterceptorChainFactory().buildInterceptorChain(this);
   
  -      isStandalone = getConfiguration().getServiceName() == null || getConfiguration().getServiceName().equals("");
  -
         // register interceptor mbeans
         if (configuration.isUseMbean())
         {
            MBeanServer mbserver = JmxUtil.getMBeanServer();
            if (mbserver != null)
            {
  -            JmxUtil.registerInterceptors(mbserver, this, isStandalone);
  +            JmxUtil.registerInterceptors(mbserver, this, true);
            }
         }
   
  @@ -793,7 +789,7 @@
            {
               try
               {
  -               JmxUtil.unregisterInterceptors(mbserver, this, isStandalone);
  +               JmxUtil.unregisterInterceptors(mbserver, this, true);
               }
               catch (Exception e)
               {