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

[Brian Stansberry]

  User: bstansberry
  Date: 06/11/10 00:55:27

  Modified:    src/org/jboss/cache/config  RuntimeConfig.java
  Log:
  Temporarily support injecting an MBeanServer
  
  Revision  Changes    Path
  1.2       +16 -2     JBossCache/src/org/jboss/cache/config/RuntimeConfig.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RuntimeConfig.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/RuntimeConfig.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- RuntimeConfig.java	10 Nov 2006 04:40:47 -0000	1.1
  +++ RuntimeConfig.java	10 Nov 2006 05:55:27 -0000	1.2
  @@ -6,9 +6,9 @@
    */
   package org.jboss.cache.config;
   
  +import javax.management.MBeanServer;
   import javax.transaction.TransactionManager;
   
  -import org.jgroups.JChannelFactory;
   import org.jgroups.jmx.JChannelFactoryMBean;
   
   public class RuntimeConfig extends ConfigurationComponent
  @@ -18,6 +18,7 @@
      
      private transient TransactionManager transactionManager;
      private transient JChannelFactoryMBean muxChannelFactory;
  +   private transient MBeanServer mbeanServer;
      
      public JChannelFactoryMBean getMuxChannelFactory()
      {
  @@ -41,6 +42,17 @@
         this.transactionManager = transactionManager;
      }
   
  +   public MBeanServer getMbeanServer()
  +   {
  +      return mbeanServer;
  +   }
  +
  +   public void setMbeanServer(MBeanServer mbeanServer)
  +   {
  +      testImmutability("mbeanServer");
  +      this.mbeanServer = mbeanServer;
  +   }
  +
      @Override
      public boolean equals(Object obj)
      {
  @@ -51,7 +63,8 @@
         {
            RuntimeConfig other = (RuntimeConfig) obj;
            return safeEquals(transactionManager, other.transactionManager)
  -                  && safeEquals(muxChannelFactory, other.muxChannelFactory);
  +                  && safeEquals(muxChannelFactory, other.muxChannelFactory)
  +                  && safeEquals(mbeanServer, other.mbeanServer);
         }
         
         return false;
  @@ -63,6 +76,7 @@
         int result = 17;
         result = result * 29 + (transactionManager == null ? 0 : transactionManager.hashCode());
         result = result * 29 + (muxChannelFactory == null ? 0 : muxChannelFactory.hashCode());
  +      result = result * 29 + (mbeanServer == null ? 0 : mbeanServer.hashCode());
         return result;
      }