You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mr...@apache.org on 2007/01/25 09:58:10 UTC
svn commit: r499704 -
/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Author: mrdon
Date: Thu Jan 25 00:57:59 2007
New Revision: 499704
URL: http://svn.apache.org/viewvc?view=rev&rev=499704
Log:
Fixed when custom i18n props not specified
WW-1668
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java?view=diff&rev=499704&r1=499703&r2=499704
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java (original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/config/BeanSelectionProvider.java Thu Jan 25 00:57:59 2007
@@ -172,11 +172,13 @@
// TODO: This should be moved to XWork after 2.0.4
// struts.custom.i18n.resources
- try {
- LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
+ LocalizedTextUtil.addDefaultResourceBundle("org/apache/struts2/struts-messages");
+
+ String bundles = props.getProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES);
+ if (bundles != null && bundles.length() > 0) {
StringTokenizer customBundles = new StringTokenizer(props.getProperty(StrutsConstants.STRUTS_CUSTOM_I18N_RESOURCES), ", ");
-
+
while (customBundles.hasMoreTokens()) {
String name = customBundles.nextToken();
try {
@@ -185,9 +187,7 @@
} catch (Exception e) {
LOG.error("Could not find messages file " + name + ".properties. Skipping");
}
- }
- } catch (IllegalArgumentException e) {
- // Assume it's OK, since many applications do not provide custom resource bundles.
+ }
}
}