You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ho...@apache.org on 2001/07/19 01:16:20 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java
horwat 01/07/18 16:16:20
Modified: jasper/src/share/org/apache/jasper/runtime
JspRuntimeLibrary.java
Log:
Fix the class comparison when converting property values.
Bugzilla #2655
Revision Changes Path
1.7 +5 -5 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
Index: JspRuntimeLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JspRuntimeLibrary.java 2001/04/25 02:52:54 1.6
+++ JspRuntimeLibrary.java 2001/07/18 23:16:20 1.7
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v 1.6 2001/04/25 02:52:54 horwat Exp $
- * $Revision: 1.6 $
- * $Date: 2001/04/25 02:52:54 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v 1.7 2001/07/18 23:16:20 horwat Exp $
+ * $Revision: 1.7 $
+ * $Date: 2001/07/18 23:16:20 $
*
* ====================================================================
*
@@ -167,12 +167,12 @@
return new Long(s);
} else if ( t.equals(Double.class) || t.equals(Double.TYPE) ) {
return new Double(s);
- } else if ( t.equals(Object.class) ) {
- return new Object[] {s};
} else if ( t.equals(String.class) ) {
return s;
} else if ( t.equals(java.io.File.class) ) {
return new java.io.File(s);
+ } else if (t.getName().equals("java.lang.Object")) {
+ return new Object[] {s};
} else {
return getValueFromPropertyEditorManager(
t, propertyName, s);