kinman 02/05/06 16:35:28
Modified: jasper/src/share/org/apache/jasper/compiler Tag:
tomcat_40_branch SetPropertyGenerator.java
jasper/src/share/org/apache/jasper/resources Tag:
tomcat_40_branch messages.properties
messages_es.properties messages_ja.properties
jasper/src/share/org/apache/jasper/runtime Tag:
tomcat_40_branch PageContextImpl.java
Log:
- Ported fixex for 5998 and 7124 from the head branch.
Revision Changes Path
No revision
No revision
1.3.4.2 +4 -4
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java
Index: SetPropertyGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
retrieving revision 1.3.4.1
retrieving revision 1.3.4.2
diff -u -r1.3.4.1 -r1.3.4.2
--- SetPropertyGenerator.java 2 Apr 2002 16:11:12 -0000 1.3.4.1
+++ SetPropertyGenerator.java 6 May 2002 23:35:27 -0000 1.3.4.2
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
1.3.4.1 2002/04/02 16:11:12 glenn Exp $
- * $Revision: 1.3.4.1 $
- * $Date: 2002/04/02 16:11:12 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/SetPropertyGenerator.java,v
1.3.4.2 2002/05/06 23:35:27 kinman Exp $
+ * $Revision: 1.3.4.2 $
+ * $Date: 2002/05/06 23:35:27 $
*
* ====================================================================
*
@@ -103,7 +103,7 @@
if (property.equals("*")) {
if (value != null) {
- String m =
Constants.getString("jsp.error.setproperty.invalidSyantx");
+ String m =
Constants.getString("jsp.error.setproperty.invalidSyntax");
throw new CompileException(start, m);
}
No revision
No revision
1.20.2.6 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties
Index: messages.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages.properties,v
retrieving revision 1.20.2.5
retrieving revision 1.20.2.6
diff -u -r1.20.2.5 -r1.20.2.6
--- messages.properties 22 Mar 2002 03:36:15 -0000 1.20.2.5
+++ messages.properties 6 May 2002 23:35:28 -0000 1.20.2.6
@@ -1,4 +1,4 @@
-# $Id: messages.properties,v 1.20.2.5 2002/03/22 03:36:15 larryi Exp $
+# $Id: messages.properties,v 1.20.2.6 2002/05/06 23:35:28 kinman Exp $
#
# Default localized string information
# Localized this the Default Locale as is en_US
@@ -106,7 +106,7 @@
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} not found
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} not found
jsp.error.setproperty.ClassNotFound=setProperty: Class {0} not found
-jsp.error.setproperty.invalidSyantax=setProperty: can't have non-null value when
property=*
+jsp.error.setproperty.invalidSyntax=setProperty: can't have non-null value when
property=*
jsp.error.setproperty.beanInfoNotFound=setproperty: beanInfo for bean {0} not found
jsp.error.setproperty.paramOrValue=setProperty: either param or value can be present
jsp.error.setproperty.arrayVal=setProperty: can't set array property {0} through a
string constant value
1.8.2.3 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties
Index: messages_es.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_es.properties,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -r1.8.2.2 -r1.8.2.3
--- messages_es.properties 30 Nov 2001 22:17:40 -0000 1.8.2.2
+++ messages_es.properties 6 May 2002 23:35:28 -0000 1.8.2.3
@@ -1,4 +1,4 @@
-# $Id: messages_es.properties,v 1.8.2.2 2001/11/30 22:17:40 larryi Exp $
+# $Id: messages_es.properties,v 1.8.2.3 2002/05/06 23:35:28 kinman Exp $
#
# Default localized string information
# Localized para Locale es_ES
@@ -91,7 +91,7 @@
jsp.error.setproperty.beanNotFound=setProperty: Bean {0} no encontrado
jsp.error.getproperty.beanNotFound=getProperty: Bean {0} no encontrado
jsp.error.setproperty.ClassNotFound=setProperty: clase {0} no encontrada
-jsp.error.setproperty.invalidSyantax=setProperty: No puede haber unvalo no nulo
cuando se ha especificado property=*
+jsp.error.setproperty.invalidSyntax=setProperty: No puede haber unvalo no nulo
cuando se ha especificado property=*
jsp.error.setproperty.beanInfoNotFound=setproperty: beanInfo para bean {0} no
encontrado
jsp.error.setproperty.paramOrValue=setProperty: O param o value pueden estar
presentes
jsp.error.setproperty.arrayVal=setProperty: No puede escribir a la propiedad de
array {0} a traves de una valor de cadena literal
1.2.2.5 +2 -2
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_ja.properties
Index: messages_ja.properties
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/resources/messages_ja.properties,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- messages_ja.properties 30 Nov 2001 22:17:40 -0000 1.2.2.4
+++ messages_ja.properties 6 May 2002 23:35:28 -0000 1.2.2.5
@@ -1,4 +1,4 @@
-# $Id: messages_ja.properties,v 1.2.2.4 2001/11/30 22:17:40 larryi Exp $
+# $Id: messages_ja.properties,v 1.2.2.5 2002/05/06 23:35:28 kinman Exp $
#
# Default localized string information
# Localized this the Default Locale as is ja_JP
@@ -103,7 +103,7 @@
jsp.error.setproperty.beanNotFound=setProperty: Bean {0}
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
jsp.error.getproperty.beanNotFound=getProperty: Bean {0}
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
jsp.error.setproperty.ClassNotFound=setProperty: \u30af\u30e9\u30b9 {0}
\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
-jsp.error.setproperty.invalidSyantax=setProperty:
property=*\u306e\u5834\u5408\u306fnull\u3067\u306a\u3044\u5024\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
+jsp.error.setproperty.invalidSyntax=setProperty:
property=*\u306e\u5834\u5408\u306fnull\u3067\u306a\u3044\u5024\u3092\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
jsp.error.setproperty.beanInfoNotFound=setproperty: Bean {0}
\u306ebeanInfo\u304c\u898b\u3064\u304b\u308a\u307e\u305b\u3093
jsp.error.setproperty.paramOrValue=setProperty:
param\u5c5e\u6027\u304bvalue\u5c5e\u6027\u306e\u3069\u3061\u3089\u304b\u4e00\u3064\u3060\u3051\u3092\u6307\u5b9a\u3067\u304d\u307e\u3059
jsp.error.setproperty.arrayVal=setProperty: \u5c5e\u6027\u914d\u5217 {0}
\u3092\u6587\u5b57\u5217\u5b9a\u6570\u5024\u3067\u6307\u5b9a\u3067\u304d\u307e\u305b\u3093
No revision
No revision
1.13.2.4 +11 -3
jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.13.2.3
retrieving revision 1.13.2.4
diff -u -r1.13.2.3 -r1.13.2.4
--- PageContextImpl.java 15 Dec 2001 00:18:48 -0000 1.13.2.3
+++ PageContextImpl.java 6 May 2002 23:35:28 -0000 1.13.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.13.2.3 2001/12/15 00:18:48 kinman Exp $
- * $Revision: 1.13.2.3 $
- * $Date: 2001/12/15 00:18:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.13.2.4 2002/05/06 23:35:28 kinman Exp $
+ * $Revision: 1.13.2.4 $
+ * $Date: 2002/05/06 23:35:28 $
*
* ====================================================================
*
@@ -460,6 +460,14 @@
if (t instanceof IOException) throw (IOException)t;
if (t instanceof ServletException) throw (ServletException)t;
if (t instanceof RuntimeException) throw (RuntimeException)t;
+ if (t instanceof JspException) {
+ Throwable rootCause = ((JspException)t).getRootCause();
+ if (rootCause != null) {
+ throw new ServletException(t.getMessage(), rootCause);
+ } else {
+ throw new ServletException(t);
+ }
+ }
throw new ServletException(t);
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
