[jboss-cvs] JBossCache/src-50/org/jboss/cache/pojo/collection ...

[Ben Wang]

  User: bwang   
  Date: 06/09/06 09:36:23

  Modified:    src-50/org/jboss/cache/pojo/collection  CachedMapImpl.java
  Log:
  Updated api
  
  Revision  Changes    Path
  1.13      +12 -5     JBossCache/src-50/org/jboss/cache/pojo/collection/CachedMapImpl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CachedMapImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/collection/CachedMapImpl.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- CachedMapImpl.java	5 Sep 2006 06:11:25 -0000	1.12
  +++ CachedMapImpl.java	6 Sep 2006 13:36:23 -0000	1.13
  @@ -141,7 +141,7 @@
            return 0;
         }
   
  -      Map children = node.getData();
  +      Collection<Node> children = node.getChildren();
         return children == null ? 0 : children.size();
      }
   
  @@ -152,8 +152,14 @@
   
      public boolean containsKey(Object object)
      {
  -      Map children = getNode().getData();
  -      return children != null && children.containsKey(Null.toNullKeyObject(object));
  +      Collection<Node> children = getNode().getChildren();
  +      if(children == null) return false;
  +      for(Node n: children)
  +      {
  +         if(n.getFqn().getLast().equals(Null.toNullKeyObject(object))) return true;
  +      }
  +
  +      return false;
      }
   
      public boolean containsValue(Object object)
  @@ -243,8 +249,9 @@
                  {
                     try
                     {
  -                     lastKey = ((Node)i.next()).getFqn().getLast();
  -                     return Null.toNullValue(pCache_.getObject((Fqn)lastKey));
  +                     Fqn f = ((Node)i.next()).getFqn();
  +                     lastKey = f.getLast();
  +                     return Null.toNullValue(pCache_.getObject(f));
                     }
                     catch (CacheException e)
                     {