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 2005/01/07 17:23:47 UTC

svn commit: r124536 - /lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java

Author: andreas
Date: Fri Jan  7 08:23:44 2005
New Revision: 124536

URL: http://svn.apache.org/viewcvs?view=rev&rev=124536
Log:
fixed StringIndexException for language prefixes like de_CH
Modified:
   lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java

Modified: lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java
Url: http://svn.apache.org/viewcvs/lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java?view=diff&rev=124536&p1=lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java&r1=124535&p2=lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java&r2=124536
==============================================================================
--- lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java	(original)
+++ lenya/trunk/src/java/org/apache/lenya/cms/publication/DefaultDocumentBuilder.java	Fri Jan  7 08:23:44 2005
@@ -122,8 +122,13 @@
 
         String language = "";
         String url = urlWithoutSuffix;
-        if (url.length() >= 3 && url.substring(url.length() -6).indexOf("_") != -1) {
-            language = url.substring(url.lastIndexOf("_") +1);
+        
+        int languageSeparatorIndex = url.lastIndexOf("_");
+        if (languageSeparatorIndex > -1) {
+            String suffix = url.substring(languageSeparatorIndex + 1);
+            if (suffix.length() <= 5) {
+                language = suffix;
+            }
         }
         return language;
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org