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

[Manik Surtani]

  User: msurtani
  Date: 07/06/14 11:19:24

  Modified:    src/org/jboss/cache/config  Configuration.java
  Log:
  JBCACHE-1107 and JBCACHE-1109
  
  Revision  Changes    Path
  1.48      +36 -10    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.47
  retrieving revision 1.48
  diff -u -b -r1.47 -r1.48
  --- Configuration.java	30 May 2007 22:14:09 -0000	1.47
  +++ Configuration.java	14 Jun 2007 15:19:24 -0000	1.48
  @@ -24,6 +24,7 @@
           implements Cloneable
   {
      private static final long serialVersionUID = 5553791890144997466L;
  +   private int numberOfNotifierThreads = 25;
   
      /**
       * Cache replication mode.
  @@ -123,7 +124,7 @@
      private CacheMode cacheMode = CacheMode.LOCAL;
      private boolean inactiveOnStartup = false;
      @Dynamic
  -   private long initialStateRetrievalTimeout = 10000;
  +   private long stateRetrievalTimeout = 10000;
      private IsolationLevel isolationLevel = IsolationLevel.REPEATABLE_READ;
      @Dynamic
      private boolean lockParentForChildInsertRemove = false;
  @@ -345,10 +346,16 @@
         this.nodeLockingOptimistic = nodeLockingOptimistic;
      }
   
  -   public void setInitialStateRetrievalTimeout(long initialStateRetrievalTimeout)
  +   @Deprecated
  +   public void setInitialStateRetrievalTimeout(long stateRetrievalTimeout)
      {
  -      testImmutability("initialStateRetrievalTimeout");
  -      this.initialStateRetrievalTimeout = initialStateRetrievalTimeout;
  +      setStateRetrievalTimeout(stateRetrievalTimeout);
  +   }
  +
  +   public void setStateRetrievalTimeout(long stateRetrievalTimeout)
  +   {
  +      testImmutability("stateRetrievalTimeout");
  +      this.stateRetrievalTimeout = stateRetrievalTimeout;
      }
   
      public void setNodeLockingScheme(String nodeLockingScheme)
  @@ -561,9 +568,15 @@
         return nodeLockingScheme;
      }
   
  +   @Deprecated
      public long getInitialStateRetrievalTimeout()
      {
  -      return initialStateRetrievalTimeout;
  +      return getStateRetrievalTimeout();
  +   }
  +
  +   public long getStateRetrievalTimeout()
  +   {
  +      return stateRetrievalTimeout;
      }
   
      public String getMultiplexerStack()
  @@ -604,6 +617,16 @@
         this.marshallerClass = marshallerClass;
      }
   
  +   public int getNumberOfNotifierThreads()
  +   {
  +      return numberOfNotifierThreads;
  +   }
  +
  +   public void setNumberOfNotifierThreads(int numberOfNotifierThreads)
  +   {
  +      this.numberOfNotifierThreads = numberOfNotifierThreads;
  +   }
  +
      // ------------------------------------------------------------------------------------------------------------
      //   HELPERS
      // ------------------------------------------------------------------------------------------------------------
  @@ -622,7 +645,7 @@
   
         if (fetchInMemoryState != that.fetchInMemoryState) return false;
         if (inactiveOnStartup != that.inactiveOnStartup) return false;
  -      if (initialStateRetrievalTimeout != that.initialStateRetrievalTimeout) return false;
  +      if (stateRetrievalTimeout != that.stateRetrievalTimeout) return false;
         if (lockAcquisitionTimeout != that.lockAcquisitionTimeout) return false;
         if (nodeLockingOptimistic != that.nodeLockingOptimistic) return false;
         if (replQueueInterval != that.replQueueInterval) return false;
  @@ -665,6 +688,8 @@
   
         if (lockParentForChildInsertRemove != that.lockParentForChildInsertRemove) return false;
   
  +      if (numberOfNotifierThreads != that.numberOfNotifierThreads) return false;
  +
         return true;
      }
   
  @@ -683,7 +708,7 @@
         result = 29 * result + (int) (syncReplTimeout ^ (syncReplTimeout >>> 32));
         result = 29 * result + (cacheMode != null ? cacheMode.hashCode() : 0);
         result = 29 * result + (inactiveOnStartup ? 1 : 0);
  -      result = 29 * result + (int) (initialStateRetrievalTimeout ^ (initialStateRetrievalTimeout >>> 32));
  +      result = 29 * result + (int) (stateRetrievalTimeout ^ (stateRetrievalTimeout >>> 32));
         result = 29 * result + (isolationLevel != null ? isolationLevel.hashCode() : 0);
         result = 29 * result + (evictionConfig != null ? evictionConfig.hashCode() : 0);
         result = 29 * result + (useRegionBasedMarshalling ? 1 : 0);
  @@ -698,6 +723,7 @@
         result = 29 * result + (runtimeConfig != null ? runtimeConfig.hashCode() : 0);
         result = 29 * result + (marshallerClass != null ? marshallerClass.hashCode() : 0);
         result = 29 * result + (lockParentForChildInsertRemove ? 1 : 0);
  +      result = 29 * result + numberOfNotifierThreads;
         return result;
      }