You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by an...@apache.org on 2007/04/23 18:23:10 UTC
svn commit: r531523 -
/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java
Author: andreas
Date: Mon Apr 23 09:23:07 2007
New Revision: 531523
URL: http://svn.apache.org/viewvc?view=rev&rev=531523
Log:
Consider dash when computing unique node names. This fixes bug 35660. Thanks to Simon Litwan for the patch.
Modified:
lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java
Modified: lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java
URL: http://svn.apache.org/viewvc/lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java?view=diff&rev=531523&r1=531522&r2=531523
==============================================================================
--- lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java (original)
+++ lenya/trunk/src/modules/sitetree/java/src/org/apache/lenya/cms/site/tree2/TreeSiteManager.java Mon Apr 23 09:23:07 2007
@@ -172,14 +172,12 @@
int n = path.lastIndexOf("/");
String lastToken = "";
String substring = path;
- if ((n < path.length()) && (n > 0)) {
- lastToken = path.substring(n);
- substring = path.substring(0, n);
- }
+ lastToken = path.substring(n);
+ substring = path.substring(0, n);
int l = lastToken.length();
int index = lastToken.lastIndexOf("-");
- if (0 < index && index < l) {
+ if (0 < index && index < l && lastToken.substring(index + 1).matches("[\\d]*")) {
suffix = lastToken.substring(index + 1);
idwithoutsuffix = substring + lastToken.substring(0, index);
version = Integer.parseInt(suffix);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org