[exo-jcr-commits] exo-jcr SVN: r1219 - 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-28 10:44:24 -0500 (Mon, 28 Dec 2009)
New Revision: 1219

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: log.error() added

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-28 15:18:00 UTC (rev 1218)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/SessionDataManager.java	2009-12-28 15:44:24 UTC (rev 1219)
@@ -1416,7 +1416,6 @@
       if (pool)
       {
          NodeImpl pooledItem = (NodeImpl)itemsPool.getItem(data.getIdentifier());
-
          if (pooledItem == null)
          {
             NodeData pooledData = (NodeData)itemsPool.getData(data.getIdentifier());

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-28 15:18:00 UTC (rev 1218)
+++ jcr/branches/1.12.0-OPT/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/util/NodeIteratorOnDemand.java	2009-12-28 15:44:24 UTC (rev 1219)
@@ -20,13 +20,14 @@
 import org.exoplatform.services.jcr.datamodel.NodeData;
 import org.exoplatform.services.jcr.impl.core.NodeImpl;
 import org.exoplatform.services.jcr.impl.core.SessionDataManager;
+import org.exoplatform.services.log.ExoLogger;
+import org.exoplatform.services.log.Log;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
 import javax.jcr.Node;
-import javax.jcr.NodeIterator;
 import javax.jcr.RepositoryException;
 
 /**
@@ -38,8 +39,9 @@
  * @author <a href="mailto:anatoliy.bazko at exoplatform.com.ua">Anatoliy Bazko</a>
  * @version $Id$
  */
-public class NodeIteratorOnDemand implements NodeIterator
+public class NodeIteratorOnDemand extends EntityCollection
 {
+   protected static Log log = ExoLogger.getLogger("jcr.NodeIteratorOnDemand");
 
    private Iterator iter;
 
@@ -158,24 +160,23 @@
     */
    private void wrapNodeData()
    {
-      if (pos == list.size())
+      if (pos >= list.size())
       {
          return;
       }
 
-      Object obj = list.get(pos);
-
-      if (!(obj instanceof NodeImpl))
+      Object item = list.get(pos);
+      if (!(item instanceof NodeImpl))
       {
          try
          {
-            list.set(pos, dataManager.wrapNodeData((NodeData)obj, parentPrimaryTypeName, parentMixinTypeNames, pool));
+            list.set(pos, dataManager.wrapNodeData((NodeData)item, parentPrimaryTypeName, parentMixinTypeNames, pool));
          }
          catch (RepositoryException e)
          {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            log.error(e);
          }
       }
    }
+
 }