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

[Elias Ross]

  User: genman  
  Date: 07/03/06 14:18:19

  Modified:    src/org/jboss/cache  CacheImpl.java
  Log:
  Assign generic type arguments to collections
  
  Revision  Changes    Path
  1.51      +12 -9     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.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- CacheImpl.java	5 Mar 2007 19:15:56 -0000	1.50
  +++ CacheImpl.java	6 Mar 2007 19:18:19 -0000	1.51
  @@ -955,16 +955,17 @@
   
         synchronized (members)
         {
  -         if (members.size() == 0)
  +         while (members.isEmpty())
            {
               log.debug("getCoordinator(): waiting on viewAccepted()");
               try
               {
                  members.wait();
               }
  -            catch (InterruptedException iex)
  +            catch (InterruptedException e)
               {
  -               log.error("getCoordinator(): Interrupted while waiting for members to be set", iex);
  +               log.error("getCoordinator(): Interrupted while waiting for members to be set", e);
  +               break;
               }
            }
            return members.size() > 0 ? members.get(0) : null;
  @@ -2755,9 +2756,10 @@
   
      // ------------- start: buddy replication specific 'lifecycle' method calls
   
  -   public void _remoteAssignToBuddyGroup(BuddyGroup group, Map state) throws Exception
  +   public void _remoteAssignToBuddyGroup(BuddyGroup group, Map<Fqn, byte[]>  state) throws Exception
      {
  -      if (buddyManager != null) buddyManager.handleAssignToBuddyGroup(group, state);
  +      if (buddyManager != null) 
  +         buddyManager.handleAssignToBuddyGroup(group, state);
      }
   
      public void _remoteRemoveFromBuddyGroup(String groupName) throws BuddyNotInitException
  @@ -3415,7 +3417,7 @@
   
         public void viewAccepted(View new_view)
         {
  -         Vector new_mbrs = new_view.getMembers();
  +         Vector<Address> new_mbrs = new_view.getMembers();
            if (log.isInfoEnabled()) log.info("viewAccepted(): " + new_view);
            synchronized (members)
            {
  @@ -3424,12 +3426,12 @@
               {
                  // Determine what members have been removed
                  // and roll back any tx and break any locks
  -               Vector removed = (Vector) members.clone();
  +               Vector<Address> removed = new Vector<Address>(members);
                  removed.removeAll(new_mbrs);
                  removeLocksForDeadMembers(root, removed);
   
                  members.removeAllElements();
  -               members.addAll(new_view.getMembers());
  +               members.addAll(new_mbrs);
   
                  needNotification = true;
               }
  @@ -3438,7 +3440,8 @@
               coordinator = (members.size() != 0 && members.get(0).equals(getLocalAddress()));
   
               // now notify listeners - *after* updating the coordinator. - JBCACHE-662
  -            if (needNotification) notifier.notifyViewChange(new_view, true);
  +            if (needNotification)
  +               notifier.notifyViewChange(new_view, true);
   
               // Wake up any threads that are waiting to know who the members
               // are so they can figure out who the coordinator is