costin 2002/06/05 14:14:27
Modified: util/java/org/apache/tomcat/util/res StringManager.java
Log:
Avoid a NPE
Revision Changes Path
1.3 +3 -2
jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java
Index: StringManager.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/util/java/org/apache/tomcat/util/res/StringManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StringManager.java 22 Mar 2002 18:46:30 -0000 1.2
+++ StringManager.java 5 Jun 2002 21:14:26 -0000 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: StringManager.java,v 1.2 2002/03/22 18:46:30 larryi Exp $
+ * $Id: StringManager.java,v 1.3 2002/06/05 21:14:26 costin Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -82,7 +82,7 @@
* <p>Please see the documentation for java.util.ResourceBundle for
* more information.
*
- * @version $Revision: 1.2 $ $Date: 2002/03/22 18:46:30 $
+ * @version $Revision: 1.3 $ $Date: 2002/06/05 21:14:26 $
*
* @author James Duncan Davidson [[EMAIL PROTECTED]]
* @author James Todd [[EMAIL PROTECTED]]
@@ -194,6 +194,7 @@
nonNullArgs[i] = "null";
}
}
+ if( value==null ) value=key;
iString = MessageFormat.format(value, nonNullArgs);
} catch (IllegalArgumentException iae) {
StringBuffer buf = new StringBuffer();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
