svn commit: r432626 - /lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java

Author: andreas
Date: Fri Aug 18 09:16:38 2006
New Revision: 432626

URL: http://svn.apache.org/viewvc?rev=432626&view=rev
Log:
Don't use non-existing nodes in TreeSiteManager.getAvailableLocator()

Modified:
    
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java

Modified: 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
URL: 
http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java?rev=432626&r1=432625&r2=432626&view=diff
==============================================================================
--- 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
 (original)
+++ 
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree/TreeSiteManager.java
 Fri Aug 18 09:16:38 2006
@@ -427,12 +427,11 @@
         }
         SiteTree tree = getTree(factory, pub, locator.getArea());
 
-        SiteTreeNode node = (SiteTreeNode) tree.getNode(path);
         String suffix = null;
         int version = 0;
         String idwithoutsuffix = null;
 
-        if (node != null) {
+        if (tree.contains(path)) {
             int n = path.lastIndexOf("/");
             String lastToken = "";
             String substring = path;
@@ -451,10 +450,9 @@
                 idwithoutsuffix = substring + lastToken;
             }
 
-            while (node != null) {
+            while (tree.contains(path)) {
                 version = version + 1;
                 path = idwithoutsuffix + "-" + version;
-                node = (SiteTreeNode) tree.getNode(path);
             }
         }