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

[Manik Surtani]

  User: msurtani
  Date: 06/08/14 13:20:34

  Modified:    src/org/jboss/cache/factories   InterceptorChainFactory.java
                        NodeFactory.java
  Log:
  Restored some basic cache functionality (at last!)
  
  Revision  Changes    Path
  1.22      +1 -0      JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterceptorChainFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/InterceptorChainFactory.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- InterceptorChainFactory.java	20 Jul 2006 09:03:51 -0000	1.21
  +++ InterceptorChainFactory.java	14 Aug 2006 17:20:34 -0000	1.22
  @@ -26,6 +26,7 @@
   
      public Interceptor buildInterceptorChain(TreeCache cache) throws IllegalAccessException, ClassNotFoundException, InstantiationException
      {
  +      Interceptor.setTreeCacheInstance(cache);
         if (cache.getConfiguration().isNodeLockingOptimistic())
         {
            return createOptimisticInterceptorChain(cache);
  
  
  
  1.14      +10 -4     JBossCache/src/org/jboss/cache/factories/NodeFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: NodeFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/factories/NodeFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- NodeFactory.java	21 Jun 2006 11:10:58 -0000	1.13
  +++ NodeFactory.java	14 Aug 2006 17:20:34 -0000	1.14
  @@ -48,7 +48,7 @@
       */
      public DataNode createRootDataNode(byte nodeType, TreeCache cache)
      {
  -       return createDataNode(nodeType, null, Fqn.ROOT, (DataNode)null, (Map)null, cache);
  +       return createDataNode(nodeType, null, Fqn.ROOT, null, null, cache);
      }
   
      /**
  @@ -108,16 +108,22 @@
      /**
       * Creates a node of the same type of the node passed in as a template.  The template passed in is entirely unaffected
       * and is not related in any way to the new node except that they will share the same type.
  -    * @param template
  +    * @deprecated - passing in childName and fqn shuld be redundant.
       * @return TreeNode
       */
  -   public TreeNode createNodeOfType( TreeNode template, Object childName, Fqn fqn, TreeNode parent, Map data, TreeCache cache )
  +   public TreeNode createNode(Object childName, Fqn fqn, TreeNode parent, Map data, TreeCache cache)
      {
  -       return createNodeOfType( template, childName, fqn, parent, data, cache, null);
  +       return createNodeOfType(parent, childName, fqn, parent, data, cache, null);
  +   }
  +
  +    public TreeNode createNode(Object childName, TreeNode parent, Map data, TreeCache cache)
  +    {
  +        return createNodeOfType(parent, childName, new Fqn(parent.getFqn(), childName), parent, data, cache, null);
      }
   
       /**
        * same as above, passing in an explicit version
  +     * @deprecated - passing in childName and fqn shuld be redundant.
        */
       public TreeNode createNodeOfType(TreeNode template, Object childName, Fqn fqn, TreeNode parent, Map data, TreeCache cache, DataVersion version)
       {