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

[Manik Surtani]

  User: msurtani
  Date: 07/01/02 12:15:31

  Modified:    src-50/org/jboss/cache/pojo/util  CacheApiUtil.java
  Log:
  some api changes
  
  Revision  Changes    Path
  1.6       +8 -7      JBossCache/src-50/org/jboss/cache/pojo/util/CacheApiUtil.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CacheApiUtil.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src-50/org/jboss/cache/pojo/util/CacheApiUtil.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- CacheApiUtil.java	2 Jan 2007 12:27:41 -0000	1.5
  +++ CacheApiUtil.java	2 Jan 2007 17:15:31 -0000	1.6
  @@ -19,7 +19,7 @@
    * Utility for the 2.0 Cache API
    *
    * @author Ben Wang
  - * @version $Id: CacheApiUtil.java,v 1.5 2007/01/02 12:27:41 bwang Exp $
  + * @version $Id: CacheApiUtil.java,v 1.6 2007/01/02 17:15:31 msurtani Exp $
    */
   public class CacheApiUtil
   {
  @@ -27,13 +27,14 @@
      public static Set<Node> getNodeChildren(CacheSPI cache, Fqn fqn)
      {
         Node n = cache.getRoot().getChild(fqn);
  -      if(n == null) return null;
  +      if (n == null) return null;
   
  -      if (cache.getCacheLoader() != null)
  +      if (cache.getCacheLoaderManager() != null)
         {
            // We have cache loader, we can't get it directly from the local get.
            return n.getChildren();
  -      } else
  +      }
  +      else
         {
            Option option = cache.getInvocationContext().getOptionOverrides();
            // WIll run into some race error in LocalTest for Set.
  @@ -44,15 +45,15 @@
   
      public static boolean exists(CacheSPI cache, Fqn fqn, Object key)
      {
  -      if (cache.getCacheLoader() != null)
  +      if (cache.getCacheLoaderManager() != null)
         {
            // Has cache loader
  -         return (cache.get(fqn, key) != null) ? true : false;
  +         return (cache.get(fqn, key) != null);
         }
   
         Node node = cache.getRoot().getChild(fqn);
         if (node == null) return false;
         Map map = node.getData();
  -      return (map.keySet().contains(key)) ? true : false;
  +      return (map.keySet().contains(key));
      }
   }