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

[Manik Surtani]

  User: msurtani
  Date: 07/01/02 14:19:05

  Modified:    src/org/jboss/cache/interceptors  
                        OptimisticCreateIfNotExistsInterceptor.java
                        OptimisticNodeInterceptor.java
  Log:
  Optimised NodeFactory
  
  Revision  Changes    Path
  1.37      +12 -3     JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticCreateIfNotExistsInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- OptimisticCreateIfNotExistsInterceptor.java	2 Jan 2007 17:15:29 -0000	1.36
  +++ OptimisticCreateIfNotExistsInterceptor.java	2 Jan 2007 19:19:05 -0000	1.37
  @@ -7,6 +7,7 @@
   package org.jboss.cache.interceptors;
   
   import org.jboss.cache.CacheException;
  +import org.jboss.cache.CacheSPI;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.GlobalTransaction;
   import org.jboss.cache.InvocationContext;
  @@ -31,6 +32,14 @@
    */
   public class OptimisticCreateIfNotExistsInterceptor extends OptimisticInterceptor
   {
  +   private NodeFactory nodeFactory;
  +
  +   public void setCache(CacheSPI cache)
  +   {
  +      super.setCache(cache);
  +      nodeFactory = cache.getConfiguration().getRuntimeConfig().getNodeFactory();
  +   }
  +
      public Object invoke(MethodCall m) throws Throwable
      {
   
  @@ -124,7 +133,7 @@
            if (workspaceNode == null)
            {
               Node node = cache.getRoot();
  -            workspaceNode = NodeFactory.getInstance().createWorkspaceNode(node, workspace);
  +            workspaceNode = nodeFactory.createWorkspaceNode(node, workspace);
               workspace.addNode(workspaceNode);
               if (debug) log.debug("Created root node: " + workspaceNode);
            }
  @@ -188,7 +197,7 @@
   
                  Node tempNode = workspaceNode.createChild(childName, workspaceNode.getNode(), cache, versionToPassIn);
   
  -               childWorkspaceNode = NodeFactory.getInstance().createWorkspaceNode(tempNode, workspace);
  +               childWorkspaceNode = nodeFactory.createWorkspaceNode(tempNode, workspace);
                  childWorkspaceNode.setVersioningImplicit(versionToPassIn == null || !isTargetFqn);
                  if (log.isTraceEnabled())
                     log.trace("setting versioning of " + childWorkspaceNode.getFqn() + " to be " + (childWorkspaceNode.isVersioningImplicit() ? "implicit" : "explicit"));
  @@ -210,7 +219,7 @@
                  {
                     if (debug)
                        log.debug("Child node " + tempchildNode.getFqn() + " doesn't exist in workspace or has been deleted.  Adding to workspace in gtx " + gtx);
  -                  childWorkspaceNode = NodeFactory.getInstance().createWorkspaceNode(tempchildNode, workspace);
  +                  childWorkspaceNode = nodeFactory.createWorkspaceNode(tempchildNode, workspace);
                     if (isTargetFqn && !workspace.isVersioningImplicit())
                     {
                        childWorkspaceNode.setVersion(version);
  
  
  
  1.42      +10 -1     JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: OptimisticNodeInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -b -r1.41 -r1.42
  --- OptimisticNodeInterceptor.java	2 Jan 2007 14:37:14 -0000	1.41
  +++ OptimisticNodeInterceptor.java	2 Jan 2007 19:19:05 -0000	1.42
  @@ -7,6 +7,7 @@
   package org.jboss.cache.interceptors;
   
   import org.jboss.cache.CacheException;
  +import org.jboss.cache.CacheSPI;
   import org.jboss.cache.Fqn;
   import org.jboss.cache.GlobalTransaction;
   import org.jboss.cache.InvocationContext;
  @@ -31,6 +32,14 @@
    */
   public class OptimisticNodeInterceptor extends OptimisticInterceptor
   {
  +   private NodeFactory nodeFactory;
  +
  +   public void setCache(CacheSPI c)
  +   {
  +      super.setCache(c);
  +      nodeFactory = c.getConfiguration().getRuntimeConfig().getNodeFactory();
  +   }
  +
      public Object invoke(MethodCall m) throws Throwable
      {
         // bypass for buddy group org metod calls.
  @@ -440,7 +449,7 @@
            {
               return null;// seems to happen quite a bit
            }
  -         workspaceNode = NodeFactory.getInstance().createWorkspaceNode(node, workspace);
  +         workspaceNode = nodeFactory.createWorkspaceNode(node, workspace);
            workspace.addNode(workspaceNode);
         }
         // the node has been deleted dude!