taylor 2004/08/16 23:39:28
Modified: components/registry/src/java/org/apache/jetspeed/om/impl
LanguageSetImpl.java
Log:
patch from Shinsuke catching one more bug situation where when the locale is not
found, the title is empty
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.6 +6 -5
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java
Index: LanguageSetImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/om/impl/LanguageSetImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LanguageSetImpl.java 17 Aug 2004 02:16:35 -0000 1.5
+++ LanguageSetImpl.java 17 Aug 2004 06:39:28 -0000 1.6
@@ -123,15 +123,16 @@
}
if (fallBack == null)
{
+ if (locale.equals(getDefaultLocale()))
+ {
+ return new LanguageImpl(locale, "");
+ }
+
ResourceBundle bundle = null;
if (resources != null)
{
bundle = loadResourceBundle(locale);
}
- if (bundle == null)
- {
- return new LanguageImpl(locale, "");
- }
fallBack = createLanguage(locale, bundle);
}
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
