From 02240338a2b98b0393ebc0d30b6cf96d0203957a Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 8 Apr 2009 11:08:17 +0000
Subject: [PATCH] Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=46933
 Simplify StringManager using Java 5 features. Based on a patch by Jens
 Kapitza. Include a test case to ensure simplification is OK for null input

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@763183 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/tomcat/util/res/StringManager.java | 102 ++-------------------
 .../apache/tomcat/util/res/TestStringManager.java  |  44 +++++++++
 2 files changed, 50 insertions(+), 96 deletions(-)
 create mode 100644 test/org/apache/tomcat/util/res/TestStringManager.java

diff --git a/java/org/apache/tomcat/util/res/StringManager.java b/java/org/apache/tomcat/util/res/StringManager.java
index 41136f1ea..ce3ea356a 100644
--- a/java/org/apache/tomcat/util/res/StringManager.java
+++ b/java/org/apache/tomcat/util/res/StringManager.java
@@ -131,107 +131,17 @@ public class StringManager {
      * @param args
      */
 
-    public String getString(String key, Object[] args) {
-        String iString = null;
+    public String getString(final String key, final Object... args) {
         String value = getString(key);
-
-        // this check for the runtime exception is some pre 1.1.6
-        // VM's don't do an automatic toString() on the passed in
-        // objects and barf out
-
-        try {
-            // ensure the arguments are not null so pre 1.2 VM's don't barf
-            if(args==null){
-                args = new Object[1];
-            }
-            
-            Object[] nonNullArgs = args;
-            for (int i=0; i<args.length; i++) {
-                if (args[i] == null) {
-                    if (nonNullArgs==args){
-                        nonNullArgs=args.clone();
-                    }
-                    nonNullArgs[i] = "null";
-                }
-            }
-            if( value==null ) value=key;
-	    MessageFormat mf = new MessageFormat(value);
-            mf.setLocale(locale);
-            iString = mf.format(nonNullArgs, new StringBuffer(), null).toString();
-        } catch (IllegalArgumentException iae) {
-            StringBuffer buf = new StringBuffer();
-            buf.append(value);
-            for (int i = 0; i < args.length; i++) {
-                buf.append(" arg[" + i + "]=" + args[i]);
-            }
-            iString = buf.toString();
+        if (value == null) {
+            value = key;
         }
-        return iString;
-    }
-
-    /**
-     * Get a string from the underlying resource bundle and format it
-     * with the given object argument. This argument can of course be
-     * a String object.
-     *
-     * @param key
-     * @param arg
-     */
 
-    public String getString(String key, Object arg) {
-	Object[] args = new Object[] {arg};
-	return getString(key, args);
+        MessageFormat mf = new MessageFormat(value);
+        mf.setLocale(locale);
+        return mf.format(args, new StringBuffer(), null).toString();
     }
 
-    /**
-     * Get a string from the underlying resource bundle and format it
-     * with the given object arguments. These arguments can of course
-     * be String objects.
-     *
-     * @param key
-     * @param arg1
-     * @param arg2
-     */
-
-    public String getString(String key, Object arg1, Object arg2) {
-	Object[] args = new Object[] {arg1, arg2};
-	return getString(key, args);
-    }
-    
-    /**
-     * Get a string from the underlying resource bundle and format it
-     * with the given object arguments. These arguments can of course
-     * be String objects.
-     *
-     * @param key
-     * @param arg1
-     * @param arg2
-     * @param arg3
-     */
-
-    public String getString(String key, Object arg1, Object arg2,
-			    Object arg3) {
-	Object[] args = new Object[] {arg1, arg2, arg3};
-	return getString(key, args);
-    }
-
-    /**
-     * Get a string from the underlying resource bundle and format it
-     * with the given object arguments. These arguments can of course
-     * be String objects.
-     *
-     * @param key
-     * @param arg1
-     * @param arg2
-     * @param arg3
-     * @param arg4
-     */
-
-    public String getString(String key, Object arg1, Object arg2,
-			    Object arg3, Object arg4) {
-	Object[] args = new Object[] {arg1, arg2, arg3, arg4};
-	return getString(key, args);
-    }
     // --------------------------------------------------------------
     // STATIC SUPPORT METHODS
     // --------------------------------------------------------------
diff --git a/test/org/apache/tomcat/util/res/TestStringManager.java b/test/org/apache/tomcat/util/res/TestStringManager.java
new file mode 100644
index 000000000..00ea9b323
--- /dev/null
+++ b/test/org/apache/tomcat/util/res/TestStringManager.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.tomcat.util.res;
+
+import junit.framework.TestCase;
+
+public class TestStringManager extends TestCase {
+
+    private static final StringManager sm =
+        StringManager.getManager("org.apache.naming");
+
+    public void testNullKey() {
+        boolean iaeThrown = false;
+        
+        try {
+            sm.getString(null);
+        } catch (IllegalArgumentException iae) {
+            iaeThrown = true;
+        }
+        assertEquals("IAE not thrown on null key", true, iaeThrown);
+    }
+    
+    public void testBug46933() {
+        // Check null args are OK
+        sm.getString("namingContext.nameNotBound");
+        sm.getString("namingContext.nameNotBound", (Object[]) null);
+        sm.getString("namingContext.nameNotBound", new Object[1]);
+    }
+}
-- 
2.11.0