[exo-jcr-commits] exo-jcr SVN: r1242 - in jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: util and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2009-12-29 10:53:15 -0500 (Tue, 29 Dec 2009)
New Revision: 1242

Modified:
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
   jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/NodeIteratorOnDemand.java
Log:
EXOJCR-338: remove pool parameter

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-29 15:16:22 UTC (rev 1241)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-29 15:53:15 UTC (rev 1242)
@@ -1407,30 +1407,27 @@
     * @throws RepositoryException
     *          if errors is occurs
     */
-   public NodeImpl wrapNodeData(NodeData data, InternalQName parentPrimaryTypeName,
-      InternalQName[] parentMixinTypeNames, boolean pool) throws RepositoryException
+   public NodeImpl wrapNodeData(NodeData data, InternalQName parentPrimaryTypeName, InternalQName[] parentMixinTypeNames)
+      throws RepositoryException
    {
       NodeImpl item = itemFactory.createNode(data, parentPrimaryTypeName, parentMixinTypeNames);
       session.getActionHandler().postRead(item);
 
-      if (pool)
+      NodeImpl pooledItem = (NodeImpl)itemsPool.getItem(data.getIdentifier());
+      if (pooledItem == null)
       {
-         NodeImpl pooledItem = (NodeImpl)itemsPool.getItem(data.getIdentifier());
-         if (pooledItem == null)
+         NodeData pooledData = (NodeData)itemsPool.getData(data.getIdentifier());
+         if (pooledData != null)
          {
-            NodeData pooledData = (NodeData)itemsPool.getData(data.getIdentifier());
-            if (pooledData != null)
-            {
-               item.loadData(pooledData);
-            }
-
-            item = (NodeImpl)itemsPool.get(item);
+            item.loadData(pooledData);
          }
-         else
-         {
-            item = pooledItem;
-         }
+
+         item = (NodeImpl)itemsPool.get(item);
       }
+      else
+      {
+         item = pooledItem;
+      }
 
       return item;
    }

Modified: jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/NodeIteratorOnDemand.java
===================================================================
--- jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/NodeIteratorOnDemand.java	2009-12-29 15:16:22 UTC (rev 1241)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/NodeIteratorOnDemand.java	2009-12-29 15:53:15 UTC (rev 1242)
@@ -53,8 +53,6 @@
 
    private InternalQName[] parentMixinTypeNames;
 
-   private boolean pool;
-
    private int pos;
 
    /**
@@ -67,13 +65,11 @@
     *          parent primary type name
     * @param parentMixinTypeNames
     *          parent mixin type names
-    * @param pool
-    *          indicates does the item fall in pool when NodeImpl will be created
     * @param dataManager
     *          session data manager
     */
    public NodeIteratorOnDemand(List list, SessionDataManager dataManager, InternalQName parentPrimaryTypeName,
-      InternalQName[] parentMixinTypeNames, boolean pool)
+      InternalQName[] parentMixinTypeNames)
    {
       if (list == null)
          this.list = new ArrayList();
@@ -83,7 +79,6 @@
       this.dataManager = dataManager;
       this.parentPrimaryTypeName = parentPrimaryTypeName;
       this.parentMixinTypeNames = parentMixinTypeNames;
-      this.pool = pool;
 
       this.iter = list.iterator();
       this.pos = 0;
@@ -170,7 +165,7 @@
       {
          try
          {
-            list.set(pos, dataManager.wrapNodeData((NodeData)item, parentPrimaryTypeName, parentMixinTypeNames, pool));
+            list.set(pos, dataManager.wrapNodeData((NodeData)item, parentPrimaryTypeName, parentMixinTypeNames));
          }
          catch (RepositoryException e)
          {