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

[Brian Stansberry]

  User: bstansberry
  Date: 07/05/09 14:23:24

  Modified:    src/org/jboss/cache/config  Configuration.java
  Log:
  [JBCACHE-934] Remove ChannelFactory JMX lookup from CacheImpl
  
  Revision  Changes    Path
  1.44      +0 -17     JBossCache/src/org/jboss/cache/config/Configuration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Configuration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/config/Configuration.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -b -r1.43 -r1.44
  --- Configuration.java	30 Mar 2007 14:06:34 -0000	1.43
  +++ Configuration.java	9 May 2007 18:23:24 -0000	1.44
  @@ -140,7 +140,6 @@
      private BuddyReplicationConfig buddyReplicationConfig;
      private boolean nodeLockingOptimistic = false;
      private NodeLockingScheme nodeLockingScheme = NodeLockingScheme.PESSIMISTIC;
  -   private String muxServiceName = null;
      private String muxStackName = null;
      private boolean usingMultiplexer = false;
      private transient RuntimeConfig runtimeConfig;
  @@ -427,12 +426,6 @@
         this.muxStackName = stackName;
      }
   
  -   public void setMultiplexerService(String serviceName)
  -   {
  -      testImmutability("muxServiceName");
  -      this.muxServiceName = serviceName;
  -   }
  -
      public boolean isUsingMultiplexer()
      {
         return usingMultiplexer;
  @@ -591,11 +584,6 @@
         return muxStackName;
      }
   
  -   public String getMultiplexerService()
  -   {
  -      return muxServiceName;
  -   }
  -
      /**
       * Retrieves the JMX service name to bind the cache to, if any.
       */
  @@ -683,10 +671,6 @@
            return false;
         }
         if (isolationLevel != that.isolationLevel) return false;
  -      if (muxServiceName != null ? !muxServiceName.equals(that.muxServiceName) : that.muxServiceName != null)
  -      {
  -         return false;
  -      }
         if (muxStackName != null ? !muxStackName.equals(that.muxStackName) : that.muxStackName != null) return false;
         if (nodeLockingScheme != that.nodeLockingScheme) return false;
         if (transactionManagerLookupClass != null ? !transactionManagerLookupClass.equals(that.transactionManagerLookupClass) : that.transactionManagerLookupClass != null)
  @@ -731,7 +715,6 @@
         result = 29 * result + (buddyReplicationConfig != null ? buddyReplicationConfig.hashCode() : 0);
         result = 29 * result + (nodeLockingOptimistic ? 1 : 0);
         result = 29 * result + (nodeLockingScheme != null ? nodeLockingScheme.hashCode() : 0);
  -      result = 29 * result + (muxServiceName != null ? muxServiceName.hashCode() : 0);
         result = 29 * result + (muxStackName != null ? muxStackName.hashCode() : 0);
         result = 29 * result + (runtimeConfig != null ? runtimeConfig.hashCode() : 0);
         result = 29 * result + (marshallerClass != null ? marshallerClass.hashCode() : 0);