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

[Manik Surtani]

  User: msurtani
  Date: 06/10/11 09:16:33

  Modified:    src/org/jboss/cache  Tag: Branch_JBossCache_1_4_0
                        TreeCache.java
  Log:
  JBCACHE-761
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.195.2.12 +13 -65    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.11
  retrieving revision 1.195.2.12
  diff -u -b -r1.195.2.11 -r1.195.2.12
  --- TreeCache.java	9 Oct 2006 22:25:06 -0000	1.195.2.11
  +++ TreeCache.java	11 Oct 2006 13:16:32 -0000	1.195.2.12
  @@ -80,7 +80,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.11 2006/10/09 22:25:06 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.195.2.12 2006/10/11 13:16:32 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -1427,8 +1427,19 @@
               if (log.isInfoEnabled()) log.info("TreeCache local address is " + channel.getLocalAddress());
               if (getFetchStateOnStartup())
               {
  +               try
  +               {
                  fetchStateOnStartup();
               }
  +               catch (Exception e)
  +               {
  +                  // make sure we disconnect from the channel before we throw this exception!
  +                  // JBCACHE-761
  +                  channel.disconnect();
  +                  channel.close();
  +                  throw e;
  +               }
  +            }
               if (buddyManager != null)
               {
                   buddyManager.init(this);
  @@ -5010,69 +5021,6 @@
          }
          return list;
      }
  -
  -
  -    /**
  -     * Performs a search.  returns a 2-dim object array, 0 - callResult, 1 - actualFqn (if found in a backup subtree), null otherwise
  -     * @param m
  -     * @param args
  -     * @param searchBackupSubtrees
  -     * @return
  -     * @throws Exception
  -     */
  -//   private Object[] findForClusteredGet(MethodCall mc, Object[] args, boolean searchBackupSubtrees) throws Exception
  -//   {
  -//       Fqn fqn = (Fqn) args[0];
  -//       Method m = mc.getMethod();
  -//
  -//       if (log.isTraceEnabled()) log.trace("Invoking call " + m + " with Fqn " + fqn);
  -//       Object callResults = m.invoke(this, args);
  -//       boolean found = validResult(callResults, mc, fqn);
  -//       if (log.isTraceEnabled()) log.trace("Got result " + callResults + ", found=" + found);
  -//       if (found && callResults == null) callResults = createEmptyResults(mc);
  -//
  -//       if (found)
  -//       {
  -//           return new Object[]{callResults, null};
  -//       }
  -//       else if (searchBackupSubtrees)
  -//       {
  -//            return findForClusteredGetBackupTree(mc, args);
  -//       }
  -//       else return null;
  -//   }
  -
  -//   private Object[] findForClusteredGetBackupTree(MethodCall mc, Object[] args) throws Exception
  -//   {
  -//       // first find all the backup subtrees we have.
  -//       DataNode backupSubtree = findNode(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN);
  -//       if (backupSubtree == null) return null; // couldn't find anything here
  -//       Map children = backupSubtree.getChildren();
  -//       if (children != null)
  -//       {
  -//           Fqn originalFqn = (Fqn) args[0];
  -//
  -//           Iterator childNames = children.keySet().iterator();
  -//
  -//           Object[] retVal = null;
  -//
  -//           while (childNames.hasNext() && retVal == null)
  -//           {
  -//               Fqn backupSubtreeFqn = BuddyManager.getBackupFqn(childNames.next().toString(), originalFqn);
  -//
  -//               args[0] = backupSubtreeFqn;
  -//
  -//               Object[] callResult = findForClusteredGet(mc, args, false);
  -//
  -//               if (callResult != null) retVal = new Object[]{callResult[0], backupSubtreeFqn};
  -//           }
  -//
  -//           return retVal;
  -//       }
  -//       else return null; // couldnt find anything
  -//   }
  -
  -
       // ------------- start: buddy replication specific 'lifecycle' method calls
      
       public void _remoteAssignToBuddyGroup(BuddyGroup group, Map state) throws Exception