tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r698912 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/el/lang/ExpressionBuilder.java webapps/docs/changelog.xml
Date Thu, 25 Sep 2008 09:46:50 GMT
Author: rjung
Date: Thu Sep 25 02:46:49 2008
New Revision: 698912

URL: http://svn.apache.org/viewvc?rev=698912&view=rev
Log:
Backport r696716: fix ClassCastException in
EL ExpressionBuilder.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=698912&r1=698911&r2=698912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Sep 25 02:46:49 2008
@@ -179,16 +179,6 @@
   +1: markt, rjung, mturk
   -1: 
 
-* Fix ClassCastException in EL ExpressionBuilder when we
-  try to cast a NullPointerException to an ELException.
-  I still need to investigate where the NPE came from,
-  but simply casting seems unsafe in any case.
-  Use a cast if possible and recreate exception
-  otherwise.
-  http://svn.apache.org/viewvc?rev=696716&view=rev
-  +1: rjung, markt, mturk
-  -1: 
-
 * Correct wrong "No role found" debug message,
   logged in RealmBase even if a role was found.
   http://svn.apache.org/viewvc?rev=697158&view=rev

Modified: tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java?rev=698912&r1=698911&r2=698912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/el/lang/ExpressionBuilder.java Thu Sep 25 02:46:49
2008
@@ -132,7 +132,11 @@
         try {
             node.accept(this);
         } catch (Exception e) {
-            throw (ELException) e;
+            if (e instanceof ELException) {
+                throw (ELException) e;
+            } else {
+                throw (new ELException(e));
+            }
         }
         if (this.fnMapper instanceof FunctionMapperFactory) {
             this.fnMapper = ((FunctionMapperFactory) this.fnMapper).create();

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=698912&r1=698911&r2=698912&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Sep 25 02:46:49 2008
@@ -97,6 +97,9 @@
   </subsection>
   <subsection name="Jasper">
     <changelog>
+      <fix>
+        ClassCastException in EL ExpressionBuilder. (rjung)
+      </fix>
       <update>
         Use more generics in EL to improve type safety. (rjung)
       </update>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message