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

[Manik Surtani]

  User: msurtani
  Date: 07/03/06 15:09:56

  Modified:    src/org/jboss/cache/marshall  Tag: Branch_JBossCache_1_4_0
                        RegionManager.java
  Log:
  JBCACHE-826
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.11.2.1  +14 -6     JBossCache/src/org/jboss/cache/marshall/Attic/RegionManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RegionManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/marshall/Attic/RegionManager.java,v
  retrieving revision 1.11
  retrieving revision 1.11.2.1
  diff -u -b -r1.11 -r1.11.2.1
  --- RegionManager.java	7 Jun 2006 22:28:08 -0000	1.11
  +++ RegionManager.java	6 Mar 2007 20:09:56 -0000	1.11.2.1
  @@ -17,6 +17,13 @@
   import java.util.Comparator;
   import java.util.HashMap;
   import java.util.Map;
  +import java.util.List;
  +import java.util.LinkedList;
  +import java.util.Iterator;
  +import java.util.Set;
  +import java.util.TreeSet;
  +
  +import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
   
   /**
    * Factory to create region from configuration, to track region,
  @@ -28,14 +35,14 @@
    * need to refactor them in the future for everyone to use.</p>
    *
    * @author Ben Wang 08-2005
  - * @version $Id: RegionManager.java,v 1.11 2006/06/07 22:28:08 msurtani Exp $
  + * @version $Id: RegionManager.java,v 1.11.2.1 2007/03/06 20:09:56 msurtani Exp $
    */
   public class RegionManager
   {
   
       private Log log_ = LogFactory.getLog(RegionManager.class);
   
  -    private final Map regionMap_ = Collections.synchronizedMap(new HashMap());
  +    private final Map regionMap_ = new ConcurrentHashMap();
       private int longestFqn = 0;
   
   
  @@ -170,9 +177,10 @@
        */
       public Region[] getRegions()
       {
  -        Region r[] = (Region[]) regionMap_.values().toArray(new Region[]{});
  -        Arrays.sort(r, new RegionComparator());
  -        return r;
  +        Set s = new TreeSet(new RegionComparator());
  +        for (Iterator i = regionMap_.values().iterator(); i.hasNext();) s.add(i.next());
  +
  +        return (Region[]) s.toArray(new Region[]{});
       }
   
       /**