You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by re...@apache.org on 2002/03/09 20:23:00 UTC
cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core NamingContextListener.java
remm 02/03/09 11:23:00
Modified: catalina/src/share/org/apache/catalina/core
NamingContextListener.java
Log:
- Add support for the 'java.lang.Character' type in the ENC env entries.
Bug reported by James Cai.
Revision Changes Path
1.10 +12 -4 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
Index: NamingContextListener.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- NamingContextListener.java 20 Feb 2002 01:18:55 -0000 1.9
+++ NamingContextListener.java 9 Mar 2002 19:23:00 -0000 1.10
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v 1.9 2002/02/20 01:18:55 remm Exp $
- * $Revision: 1.9 $
- * $Date: 2002/02/20 01:18:55 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v 1.10 2002/03/09 19:23:00 remm Exp $
+ * $Revision: 1.10 $
+ * $Date: 2002/03/09 19:23:00 $
*
* ====================================================================
*
@@ -116,7 +116,7 @@
* with each context and server.
*
* @author Remy Maucherat
- * @version $Revision: 1.9 $ $Date: 2002/02/20 01:18:55 $
+ * @version $Revision: 1.10 $ $Date: 2002/03/09 19:23:00 $
*/
public class NamingContextListener
@@ -627,10 +627,18 @@
value = Double.valueOf(env.getValue());
} else if (type.equals("java.lang.Float")) {
value = Float.valueOf(env.getValue());
+ } else if (type.equals("java.lang.Character")) {
+ if (env.getValue().length() == 1) {
+ value = new Character(env.getValue().charAt(0));
+ } else {
+ throw new IllegalArgumentException();
+ }
} else {
log(sm.getString("naming.invalidEnvEntryType", env.getName()));
}
} catch (NumberFormatException e) {
+ log(sm.getString("naming.invalidEnvEntryValue", env.getName()));
+ } catch (IllegalArgumentException e) {
log(sm.getString("naming.invalidEnvEntryValue", env.getName()));
}
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>