[jboss-cvs] JBossCache/tests/functional/org/jboss/cache/statetransfer ...

[Manik Surtani]

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

  Modified:    tests/functional/org/jboss/cache/statetransfer   
                        StateTransferTestBase.java
                        ForcedStateTransferTest.java
                        FailedStateTransferTest.java
  Log:
  JBCACHE-1109
  
  Revision  Changes    Path
  1.39      +13 -13    JBossCache/tests/functional/org/jboss/cache/statetransfer/StateTransferTestBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: StateTransferTestBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/statetransfer/StateTransferTestBase.java,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -b -r1.38 -r1.39
  --- StateTransferTestBase.java	23 Apr 2007 14:52:29 -0000	1.38
  +++ StateTransferTestBase.java	14 Jun 2007 15:30:14 -0000	1.39
  @@ -109,7 +109,7 @@
         c.setClusterName("VersionedTestBase");
         c.setReplVersionString(getReplicationVersion());
         // Use a long timeout to facilitate setting debugger breakpoints
  -      c.setInitialStateRetrievalTimeout(60000);
  +      c.setStateRetrievalTimeout(60000);
         if (useMarshalling)
         {
            c.setUseRegionBasedMarshalling(true);
  
  
  
  1.13      +23 -17    JBossCache/tests/functional/org/jboss/cache/statetransfer/ForcedStateTransferTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ForcedStateTransferTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/statetransfer/ForcedStateTransferTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- ForcedStateTransferTest.java	3 Jan 2007 17:50:31 -0000	1.12
  +++ ForcedStateTransferTest.java	14 Jun 2007 15:30:14 -0000	1.13
  @@ -171,7 +171,13 @@
         {
            if (tx != null)
            {
  -            try { tx.commit(); } catch (Exception ignore) {}
  +            try
  +            {
  +               tx.commit();
  +            }
  +            catch (Exception ignore)
  +            {
  +            }
            }
         }
   
  @@ -773,7 +779,7 @@
      {
         CacheSPI result = super.createCache(cacheID, replSync,
                 useMarshalling, false, false, false);
  -      result.getConfiguration().setInitialStateRetrievalTimeout(0);
  +      result.getConfiguration().setStateRetrievalTimeout(0);
         result.getConfiguration().setLockAcquisitionTimeout(1000);
         result.getConfiguration().setIsolationLevel(isolationLevel);
   
  
  
  
  1.13      +2 -2      JBossCache/tests/functional/org/jboss/cache/statetransfer/FailedStateTransferTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FailedStateTransferTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/tests/functional/org/jboss/cache/statetransfer/FailedStateTransferTest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- FailedStateTransferTest.java	23 May 2007 10:28:54 -0000	1.12
  +++ FailedStateTransferTest.java	14 Jun 2007 15:30:14 -0000	1.13
  @@ -47,7 +47,7 @@
         cache.getConfiguration().setClusterName("VersionedTestBase");
         cache.getConfiguration().setReplVersionString(getReplicationVersion());
         // Use a long timeout to facilitate setting debugger breakpoints
  -      cache.getConfiguration().setInitialStateRetrievalTimeout(60000);
  +      cache.getConfiguration().setStateRetrievalTimeout(60000);
   
         // Put the cache in the map before starting, so if it fails in
         // start it can still be destroyed later
  @@ -62,7 +62,7 @@
         recipient.getConfiguration().setClusterName("VersionedTestBase");
         recipient.getConfiguration().setReplVersionString(getReplicationVersion());
         // Use a long timeout to facilitate setting debugger breakpoints
  -      recipient.getConfiguration().setInitialStateRetrievalTimeout(60000);
  +      recipient.getConfiguration().setStateRetrievalTimeout(60000);
   
         //Put the cache in the map before starting, so if it fails in
         // start it can still be destroyed later