Author: vvalchev
Date: Tue Sep 21 15:06:12 2010
New Revision: 999455
URL: http://svn.apache.org/viewvc?rev=999455&view=rev
Log:
Fixed FELIX-2609 /WebConsole doesn't work with JDK 1.3.1_06 because of Locale/
https://issues.apache.org/jira/browse/FELIX-2609
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/i18n/ResourceBundleCache.java
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.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=999455&r1=999454&r2=999455&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 Sep 21 15:06:12 2010
@@ -169,7 +169,7 @@ class ResourceBundleCache
}
else if ( locale.getCountry().length() != 0 )
{
- return new Locale( locale.getLanguage() );
+ return new Locale( locale.getLanguage(), "" ); //$NON-NLS-1$
}
else if ( !locale.getLanguage().equals( DEFAULT_LOCALE.getLanguage() )
)
{
Modified:
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java?rev=999455&r1=999454&r2=999455&view=diff
==============================================================================
---
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
(original)
+++
felix/trunk/webconsole/src/main/java/org/apache/felix/webconsole/internal/servlet/OsgiManager.java
Tue Sep 21 15:06:12 2010
@@ -965,7 +965,7 @@ public class OsgiManager extends Generic
final String name = FilenameUtils.getBaseName(img.getFile());
try
{
- final String locale = new Locale(name).getDisplayLanguage();
+ final String locale = new Locale(name,
"").getDisplayLanguage(); //$NON-NLS-1$
map.put(name, null != locale ? locale : name);
}
catch (Throwable t)
