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

[Manik Surtani]

  User: msurtani
  Date: 07/01/04 12:10:36

  Modified:    src/org/jboss/cache  RegionManager.java
  Log:
  fixed potential npe
  
  Revision  Changes    Path
  1.21      +9 -5      JBossCache/src/org/jboss/cache/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/RegionManager.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- RegionManager.java	4 Jan 2007 16:46:45 -0000	1.20
  +++ RegionManager.java	4 Jan 2007 17:10:36 -0000	1.21
  @@ -162,13 +162,17 @@
         while (nextBestThing == null)
         {
            nextFqn = nextFqn.getParent();
  +         if (regionsRegistry.containsKey(nextFqn))
  +         {
            Region r = regionsRegistry.get(nextFqn);
  +
            if (type == Region.Type.ANY
                    || (type == Region.Type.MARSHALLING && r.getClassLoader() != null)
                    || (type == Region.Type.EVICTION && r.getEvictionPolicyConfig() != null))
            {
               nextBestThing = r;
            }
  +         }
            if (nextFqn.isRoot()) break;
         }