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

[Ben Wang]

  User: bwang   
  Date: 06/11/13 03:04:03

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  JBCACHE-844 Catch the TimeoutException in loadState.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.23 +17 -2     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.195.2.22
  retrieving revision 1.195.2.23
  diff -u -b -r1.195.2.22 -r1.195.2.23
  --- TreeCache.java	11 Nov 2006 17:50:04 -0000	1.195.2.22
  +++ TreeCache.java	13 Nov 2006 08:04:03 -0000	1.195.2.23
  @@ -99,7 +99,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.195.2.22 2006/11/11 17:50:04 msurtani Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.23 2006/11/13 08:04:03 bwang Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -2089,8 +2089,23 @@
               Vector targets = new Vector();
               targets.add(target);
   
  -            List responses = callRemoteMethods(targets, replPsmc, true,
  +            List responses = null;
  +            try {
  +               responses = callRemoteMethods(targets, replPsmc, true,
                       true, sync_repl_timeout);
  +            } catch (Exception t)
  +            {
  +               if(!(t.getCause() instanceof TimeoutException)) throw t;
  +                             timeoutException = (TimeoutException) t.getCause();
  +               timeoutTarget = target;
  +               if (trace)
  +               {
  +                  log.trace("TreeCache.activateRegion(): " + ourself +
  +                          " got a TimeoutException from " + target);
  +               }
  +               continue;
  +            }
  +
               Object rsp = null;
               if (responses != null && responses.size() > 0)
               {