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

[Manik Surtani]

  User: msurtani
  Date: 06/11/10 15:32:52

  Modified:    src/org/jboss/cache  TreeCache.java
  Log:
  Fixed BR deadlock issue on startup
  
  Revision  Changes    Path
  1.265     +19 -18    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.264
  retrieving revision 1.265
  diff -u -b -r1.264 -r1.265
  --- TreeCache.java	10 Nov 2006 06:00:03 -0000	1.264
  +++ TreeCache.java	10 Nov 2006 20:32:52 -0000	1.265
  @@ -12,6 +12,7 @@
   import org.apache.commons.logging.LogFactory;
   import org.jboss.cache.buddyreplication.BuddyGroup;
   import org.jboss.cache.buddyreplication.BuddyManager;
  +import org.jboss.cache.buddyreplication.BuddyNotInitException;
   import org.jboss.cache.config.BuddyReplicationConfig;
   import org.jboss.cache.config.CacheLoaderConfig;
   import org.jboss.cache.config.Configuration;
  @@ -20,7 +21,6 @@
   import org.jboss.cache.factories.NodeFactory;
   import org.jboss.cache.interceptors.Interceptor;
   import org.jboss.cache.jmx.CacheMBean;
  -import org.jboss.cache.jmx.JmxUtil;
   import org.jboss.cache.loader.CacheLoader;
   import org.jboss.cache.loader.CacheLoaderManager;
   import org.jboss.cache.loader.NodeData;
  @@ -58,7 +58,6 @@
   import org.jgroups.util.RspList;
   import org.w3c.dom.Element;
   
  -import javax.management.MBeanOperationInfo;
   import javax.management.MBeanServer;
   import javax.management.ObjectName;
   import javax.transaction.Status;
  @@ -93,7 +92,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.264 2006/11/10 06:00:03 bstansberry Exp $
  + * @version $Id: TreeCache.java,v 1.265 2006/11/10 20:32:52 msurtani Exp $
    *          <p/>
    * @see <a href="http://labs.jboss.com/portal/jbosscache/docs">JBossCache doc</a>
    */
  @@ -808,6 +807,8 @@
            members.clear();
         }
   
  +      coordinator = false;
  +
         if (repl_queue != null)
         {
            repl_queue.stop();
  @@ -3215,7 +3216,7 @@
         if (buddyManager != null) buddyManager.handleAssignToBuddyGroup(group, state);
      }
   
  -   public void _remoteRemoveFromBuddyGroup(String groupName)
  +   public void _remoteRemoveFromBuddyGroup(String groupName) throws BuddyNotInitException
      {
         if (buddyManager != null) buddyManager.handleRemoveFromBuddyGroup(groupName);
      }