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

[Manik Surtani]

  User: msurtani
  Date: 07/06/14 11:30:14

  Modified:    src/org/jboss/cache   CacheImpl.java TreeCacheView.java
  Log:
  JBCACHE-1109
  
  Revision  Changes    Path
  1.90      +4 -4      JBossCache/src/org/jboss/cache/CacheImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/CacheImpl.java,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -b -r1.89 -r1.90
  --- CacheImpl.java	14 Jun 2007 15:19:23 -0000	1.89
  +++ CacheImpl.java	14 Jun 2007 15:30:14 -0000	1.90
  @@ -3355,7 +3355,7 @@
               ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024);
               out = new MarshalledValueOutputStream(baos);
   
  -            getStateTransferManager().getState(out, Fqn.ROOT, configuration.getInitialStateRetrievalTimeout(), true, true);
  +            getStateTransferManager().getState(out, Fqn.ROOT, configuration.getStateRetrievalTimeout(), true, true);
               result = baos.getRawBuffer();
            }
            catch (Throwable t)
  @@ -3417,7 +3417,7 @@
               out = new MarshalledValueOutputStream(baos);
   
               getStateTransferManager().getState(out, Fqn.fromString(sourceRoot),
  -                                               configuration.getInitialStateRetrievalTimeout(), true, true);
  +                                               configuration.getStateRetrievalTimeout(), true, true);
               result = baos.getRawBuffer();
            }
            catch (Throwable t)
  @@ -3437,7 +3437,7 @@
            try
            {
               out = new MarshalledValueOutputStream(ostream);
  -            getStateTransferManager().getState(out, Fqn.ROOT, configuration.getInitialStateRetrievalTimeout(), true, true);
  +            getStateTransferManager().getState(out, Fqn.ROOT, configuration.getStateRetrievalTimeout(), true, true);
            }
            catch (Throwable t)
            {
  @@ -3461,7 +3461,7 @@
            try
            {
               out = new MarshalledValueOutputStream(ostream);
  -            getStateTransferManager().getState(out, Fqn.fromString(sourceRoot), configuration.getInitialStateRetrievalTimeout(), true, true);
  +            getStateTransferManager().getState(out, Fqn.fromString(sourceRoot), configuration.getStateRetrievalTimeout(), true, true);
            }
            catch (Throwable t)
            {
  
  
  
  1.28      +30 -30    JBossCache/src/org/jboss/cache/TreeCacheView.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TreeCacheView.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/TreeCacheView.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- TreeCacheView.java	11 Jun 2007 15:06:02 -0000	1.27
  +++ TreeCacheView.java	14 Jun 2007 15:30:14 -0000	1.28
  @@ -56,7 +56,7 @@
    * data needs to be displayed, the underlying cache will be accessed directly.
    *
    * @author Bela Ban
  - * @version $Revision: 1.27 $
  + * @version $Revision: 1.28 $
    */
   public class TreeCacheView implements TreeCacheViewMBean
   {
  @@ -251,7 +251,7 @@
            Configuration c = cache.getConfiguration();
            c.setClusterName("TreeCacheGroup");
            c.setClusterConfig(props);
  -         c.setInitialStateRetrievalTimeout(10000);
  +         c.setStateRetrievalTimeout(10000);
            c.setCacheMode("REPL_ASYNC");
   
            if (use_queue)