You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@felix.apache.org by fm...@apache.org on 2011/03/23 00:04:50 UTC

svn commit: r1084402 - /felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java

Author: fmeschbe
Date: Tue Mar 22 23:04:49 2011
New Revision: 1084402

URL: http://svn.apache.org/viewvc?rev=1084402&view=rev
Log:
FELIX-2707 Fix cutting of the URL entry path which may not match the entry path looked up

Modified:
    felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java

Modified: felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java
URL: http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java?rev=1084402&r1=1084401&r2=1084402&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java (original)
+++ felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java Tue Mar 22 23:04:49 2011
@@ -136,7 +136,7 @@ class ResourceBundleCache
 
                     // calculate the key
                     String entryPath = entry.getPath();
-                    final int start = 1 + file.length(); // leading slash
+                    final int start = entryPath.lastIndexOf( '/' ) + 1 + fileName.length(); // path, slash and base name
                     final int end = entryPath.length() - 11; // .properties suffix
                     entryPath = entryPath.substring( start, end );