taylor 2005/04/03 14:14:34 Modified: components/registry/src/java/org/apache/jetspeed/om/impl LanguageSetImpl.java Log: fix for infiinte loop in getLanguage and spanish Revision Changes Path 1.10 +6 -6 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- LanguageSetImpl.java 27 Jan 2005 21:27:52 -0000 1.9 +++ LanguageSetImpl.java 3 Apr 2005 21:14:34 -0000 1.10 @@ -103,7 +103,7 @@ if (resources != null) { return createLanguage(lang.getLocale(), loadResourceBundle(lang.getLocale()), lang.getTitle(), lang - .getShortTitle(), StringUtils.join(lang.getKeywords(), ",")); + .getShortTitle(), StringUtils.join(lang.getKeywords(), ","), false); } else { @@ -120,7 +120,7 @@ if (fallBack != null && resources != null) { fallBack = createLanguage(fallBack.getLocale(), loadResourceBundle(fallBack.getLocale()), fallBack - .getTitle(), fallBack.getShortTitle(), StringUtils.join(fallBack.getKeywords(), ",")); + .getTitle(), fallBack.getShortTitle(), StringUtils.join(fallBack.getKeywords(), ","), true); } if (fallBack == null) @@ -264,7 +264,7 @@ shortTitle = defaultLang.getShortTitle(); keywords = StringUtils.join(defaultLang.getKeywords(), ","); } - return createLanguage(locale, bundle, title, shortTitle, keywords); + return createLanguage(locale, bundle, title, shortTitle, keywords, false); } /** @@ -278,9 +278,9 @@ * @return */ private Language createLanguage( Locale locale, ResourceBundle bundle, String title, String shortTitle, - String keywords ) + String keywords, boolean createNow) { - if (!locale.equals(getDefaultLocale())) + if (!createNow && !locale.equals(getDefaultLocale())) { Language defaultLang = get(getDefaultLocale());
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]