You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sv...@apache.org on 2005/08/19 02:41:49 UTC
svn commit: r233400 -
/myfaces/share/trunk/src/java/org/apache/myfaces/util/MessageUtils.java
Author: svieujot
Date: Thu Aug 18 17:41:45 2005
New Revision: 233400
URL: http://svn.apache.org/viewcvs?rev=233400&view=rev
Log:
Fix MYFACES-338 Thanks to Mike Youngstrom.
Modified:
myfaces/share/trunk/src/java/org/apache/myfaces/util/MessageUtils.java
Modified: myfaces/share/trunk/src/java/org/apache/myfaces/util/MessageUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/share/trunk/src/java/org/apache/myfaces/util/MessageUtils.java?rev=233400&r1=233399&r2=233400&view=diff
==============================================================================
--- myfaces/share/trunk/src/java/org/apache/myfaces/util/MessageUtils.java (original)
+++ myfaces/share/trunk/src/java/org/apache/myfaces/util/MessageUtils.java Thu Aug 18 17:41:45 2005
@@ -160,32 +160,35 @@
if (bundleName != null)
{
- bundle = ResourceBundle.getBundle(bundleName, locale);
try
{
+ bundle = ResourceBundle.getBundle(bundleName, locale, ClassUtils.getCurrentLoader(bundleName));
summary = bundle.getString(messageId);
}
- catch (MissingResourceException e) {}
+ catch (MissingResourceException e) {
+ // NoOp
+ }
}
if (summary == null)
{
- bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale, ClassUtils.getCurrentLoader(bundleName));
- if(bundle == null)
- {
- throw new NullPointerException();
- }
-
try
{
+ bundle = ResourceBundle.getBundle(DEFAULT_BUNDLE, locale, ClassUtils.getCurrentLoader(DEFAULT_BUNDLE));
+ if(bundle == null)
+ {
+ throw new NullPointerException();
+ }
summary = bundle.getString(messageId);
}
- catch(MissingResourceException e) { }
+ catch(MissingResourceException e) {
+ // NoOp
+ }
}
if(summary == null)
{
- return null;
+ summary = messageId;
}
if (bundle == null)
@@ -198,7 +201,9 @@
{
detail = substituteParams(locale, bundle.getString(messageId + DETAIL_SUFFIX), params);
}
- catch(MissingResourceException e) { }
+ catch(MissingResourceException e) {
+ // NoOp
+ }
return new FacesMessage(summary, detail);
}