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

[Jerry Gauthier]

  User: jerrygauth
  Date: 06/08/17 12:18:51

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  JBCACHE-470, modified TreeCache to use Configuration object for multiplexer attributes
  
  Revision  Changes    Path
  1.217     +4 -34     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.216
  retrieving revision 1.217
  diff -u -b -r1.216 -r1.217
  --- TreeCache.java	17 Aug 2006 13:06:43 -0000	1.216
  +++ TreeCache.java	17 Aug 2006 16:18:51 -0000	1.217
  @@ -74,7 +74,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.216 2006/08/17 13:06:43 jerrygauth Exp $
  + * @version $Id: TreeCache.java,v 1.217 2006/08/17 16:18:51 jerrygauth Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -100,16 +100,6 @@
      protected JChannel channel = null;
   
      /**
  -    * The JGroups multiplexer service name; null if the multiplexer isn't used
  -    */
  -   protected String mux_serviceName = null;
  -
  -   /**
  -    * The JGroups multiplexer stack name, default is "fc-fast-minimalthreads"
  -    */
  -   protected String mux_stackName = "fc-fast-minimalthreads";
  -
  -   /**
       * True if this TreeCache is the coordinator.
       */
      protected boolean coordinator = false;
  @@ -333,26 +323,6 @@
         return coordinator;
      }
   
  -   public String getMultiplexerService()
  -   {
  -      return mux_serviceName;
  -   }
  -
  -   public void setMultiplexerService(String serviceName)
  -   {
  -      mux_serviceName = serviceName;
  -   }
  -
  -   public String getMultiplexerStack()
  -   {
  -      return mux_stackName;
  -   }
  -
  -   public void setMultiplexerStack(String name)
  -   {
  -      mux_stackName = name;
  -   }
  -
      /**
       * Returns the transaction table.
       */
  @@ -630,14 +600,14 @@
                  log.info("channel is already running");
                  return;
               }
  -            if (mux_serviceName != null)
  +            if (configuration.getMultiplexerService() != null)
               {
  -               channel = getMultiplexerChannel(mux_serviceName, mux_stackName);
  +               channel = getMultiplexerChannel(configuration.getMultiplexerService(), configuration.getMultiplexerStack());
               }
               if (channel != null)
               { // mux channel
                  if (log.isDebugEnabled()) log.debug("Created Multiplexer Channel for cache cluster " + configuration.getClusterName() +
  -                     " using stack " + getMultiplexerStack());
  +                     " using stack " + configuration.getMultiplexerStack());
               }
               else
               {