svn commit: r1808368 - /uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java

[sc...@apache.org]

Author: schor
Date: Thu Sep 14 17:03:41 2017
New Revision: 1808368

URL: http://svn.apache.org/viewvc?rev=1808368&view=rev
Log:
no Jira - test for null resourcebundle in I18nUtil

Modified:
    uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java

Modified: uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java
URL: http://svn.apache.org/viewvc/uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java?rev=1808368&r1=1808367&r2=1808368&view=diff
==============================================================================
--- uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java (original)
+++ uima/uv3/uimaj-v3/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/I18nUtil.java Thu Sep 14 17:03:41 2017
@@ -113,8 +113,13 @@ public class I18nUtil {
         aLoader = MsgLocalizationClassLoader.getMsgLocalizationClassLoader();        
       }
       // locate the resource bundle for this exception's messages
-      ResourceBundle bundle =  ResourceBundle.getBundle(aResourceBundleName, aLocale, aLoader);
-      String message = bundle.getString(aMessageKey);
+      String message;
+      if (aResourceBundleName == null) {
+        message = "Null ResourceBundle, key = \"" + aMessageKey + "\"";
+      } else {
+        ResourceBundle bundle =  ResourceBundle.getBundle(aResourceBundleName, aLocale, aLoader);
+        message = bundle.getString(aMessageKey);
+      }
       // if arguments exist, use MessageFormat to include them
       if (aArguments != null && aArguments.length > 0) {
         MessageFormat fmt = new MessageFormat(message);