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

[Manik Surtani]

  User: msurtani
  Date: 07/06/14 12:14:49

  Modified:    src/org/jboss/cache/jmx   CacheJmxWrapper.java
                        LegacyConfiguration.java
  Log:
  JBCACHE-1109
  
  Revision  Changes    Path
  1.28      +13 -1     JBossCache/src/org/jboss/cache/jmx/CacheJmxWrapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheJmxWrapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/CacheJmxWrapper.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- CacheJmxWrapper.java	14 Jun 2007 15:30:16 -0000	1.27
  +++ CacheJmxWrapper.java	14 Jun 2007 16:14:48 -0000	1.28
  @@ -62,7 +62,7 @@
    * {@link CacheImpl}.
    *
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.27 $
  + * @version $Revision: 1.28 $
    */
   public class CacheJmxWrapper
         extends NotificationBroadcasterSupport
  @@ -258,6 +258,12 @@
         return getConfiguration().getStateRetrievalTimeout();
      }
   
  +   @Deprecated
  +   public void setInitialStateRetrievalTimeout(long timeout)
  +   {
  +      setStateRetrievalTimeout(timeout);
  +   }
  +
      public String getIsolationLevel()
      {
         return getConfiguration().getIsolationLevelString();
  @@ -388,6 +394,12 @@
         this.clusterConfig = config;
      }
   
  +   @Deprecated
  +   public long getInitialStateRetrievalTimeout()
  +   {
  +      return getStateRetrievalTimeout();
  +   }
  +
      public void setClusterName(String name)
      {
         getConfiguration().setClusterName(name);
  
  
  
  1.7       +18 -1     JBossCache/src/org/jboss/cache/jmx/LegacyConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LegacyConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/jmx/LegacyConfiguration.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- LegacyConfiguration.java	6 Jun 2007 12:43:50 -0000	1.6
  +++ LegacyConfiguration.java	14 Jun 2007 16:14:48 -0000	1.7
  @@ -32,7 +32,7 @@
    * Legacy configuration attributes from JBC 1.x.
    *
    * @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
  - * @version $Revision: 1.6 $
  + * @version $Revision: 1.7 $
    */
   public interface LegacyConfiguration
   {
  @@ -155,15 +155,32 @@
       * Get the max time to wait until the initial state is retrieved. This is used in a replicating cache: when a new cache joins the cluster, it needs to acquire the (replicated) state of the other members to initialize itself. If no state has been received within <tt>timeout</tt> milliseconds, the map will be empty.
       *
       * @return long Number of milliseconds to wait for the state. 0 means to wait forever.
  +    * @deprecated use {@link #getStateRetrievalTimeout()}
       */
  +   @Deprecated
      long getInitialStateRetrievalTimeout();
   
      /**
  +    * Get the max time to wait until the state is retrieved. This is used in a replicating cache: when a new cache joins the cluster, it needs to acquire the (replicated) state of the other members to initialize itself. If no state has been received within <tt>timeout</tt> milliseconds, the map will be empty.
  +    *
  +    * @return long Number of milliseconds to wait for the state. 0 means to wait forever.
  +    */
  +   long getStateRetrievalTimeout();
  +
  +   /**
       * Set the initial state transfer timeout (see {@link #getInitialStateRetrievalTimeout()})
  +    *
  +    * @deprecated use {@link #setStateRetrievalTimeout(long)}
       */
  +   @Deprecated
      void setInitialStateRetrievalTimeout(long timeout);
   
      /**
  +    * Set the state transfer timeout (see {@link #getStateRetrievalTimeout()})
  +    */
  +   void setStateRetrievalTimeout(long timeout);
  +
  +   /**
       * Returns the current caching mode. Valid values are <ul> <li>LOCAL <li>REPL_ASYNC <li>REPL_SYNC <ul>
       *
       * @return String The caching mode