[Yanel-commits] rev 25048 - public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation

[michi at wyona.com]

Author: michi
Date: 2007-06-12 14:09:57 +0200 (Tue, 12 Jun 2007)
New Revision: 25048

Modified:
   public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java
Log:
check first if node exists

Modified: public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java
===================================================================
--- public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java	2007-06-12 10:23:36 UTC (rev 25047)
+++ public/yanel/trunk/src/impl/java/org/wyona/yanel/impl/navigation/NodeResConfigAndDataRepoImpl.java	2007-06-12 12:09:57 UTC (rev 25048)
@@ -107,7 +107,6 @@
             log.debug("Check if node is a collection: " + path);
             if (resRepo.getNode(path.toString()).isCollection()) {
             //if (resRepo.isCollection(path)) {
-                log.error("DEBUG: Is collection within repo: " + path);
                 Path[] children = resRepo.getChildren(path);
                 for (int i = 0; i < children.length; i++) {
                     if (children[i].getName().indexOf(".yanel-rti") > 0) {
@@ -145,11 +144,19 @@
                     }
                     if (children[i].getName().indexOf(".yanel-rti") > 0) {
                         String cp = children[i].toString().substring(0, children[i].toString().indexOf(".yanel-rti"));
-                        if (!resRepo.isCollection(new Path(cp))) c.add(cp);
+                        if (resRepo.existsNode(cp)) {
+                            if (!resRepo.isCollection(new Path(cp))) c.add(cp);
+                        } else {
+                            c.add(cp);
+                        }
                     }
                     if (children[i].getName().indexOf(".yanel-rc") > 0) {
                         String cp = children[i].toString().substring(0, children[i].toString().indexOf(".yanel-rc"));
-                        if (!resRepo.isCollection(new Path(cp))) c.add(cp);
+                        if (resRepo.existsNode(cp)) {
+                            if (!resRepo.isCollection(new Path(cp))) c.add(cp);
+                        } else {
+                            c.add(cp);
+                        }
                     }
                 }
             } else {