taylor 2004/08/16 19:16:35
Modified: components/registry/src/java/org/apache/jetspeed/om/impl
LanguageSetImpl.java
Log:
fix infinite loop happening with some language settings
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.5 +5 -1
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LanguageSetImpl.java 16 Aug 2004 18:29:14 -0000 1.4
+++ LanguageSetImpl.java 17 Aug 2004 02:16:35 -0000 1.5
@@ -128,6 +128,10 @@
{
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]
