You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2009/04/16 16:57:40 UTC

svn commit: r765658 - in /tomcat/trunk/java: javax/servlet/jsp/el/ELException.java org/apache/jasper/runtime/PageContextImpl.java

Author: markt
Date: Thu Apr 16 14:57:40 2009
New Revision: 765658

URL: http://svn.apache.org/viewvc?rev=765658&view=rev
Log:
Clean up some deprecated code

Modified:
    tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
    tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java

Modified: tomcat/trunk/java/javax/servlet/jsp/el/ELException.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/servlet/jsp/el/ELException.java?rev=765658&r1=765657&r2=765658&view=diff
==============================================================================
--- tomcat/trunk/java/javax/servlet/jsp/el/ELException.java (original)
+++ tomcat/trunk/java/javax/servlet/jsp/el/ELException.java Thu Apr 16 14:57:40 2009
@@ -25,13 +25,7 @@
  * @deprecated
  */
 public class ELException extends Exception {
-    // -------------------------------------
-    // Member variables
-    // -------------------------------------
 
-    private Throwable mRootCause;
-
-    // -------------------------------------
     /**
      * Creates an ELException with no detail message.
      **/
@@ -39,7 +33,6 @@
         super();
     }
 
-    // -------------------------------------
     /**
      * Creates an ELException with the provided detail message.
      * 
@@ -50,7 +43,6 @@
         super(pMessage);
     }
 
-    // -------------------------------------
     /**
      * Creates an ELException with the given root cause.
      * 
@@ -58,8 +50,7 @@
      *            the originating cause of this exception
      **/
     public ELException(Throwable pRootCause) {
-        super(pRootCause.getLocalizedMessage());
-        mRootCause = pRootCause;
+        super(pRootCause);
     }
 
     // -------------------------------------
@@ -72,8 +63,7 @@
      *            the originating cause of this exception
      **/
     public ELException(String pMessage, Throwable pRootCause) {
-        super(pMessage);
-        mRootCause = pRootCause;
+        super(pMessage, pRootCause);
     }
 
     // -------------------------------------
@@ -83,6 +73,6 @@
      * @return the root cause of this exception
      */
     public Throwable getRootCause() {
-        return mRootCause;
+        return getCause();
     }
 }

Modified: tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=765658&r1=765657&r2=765658&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/PageContextImpl.java Thu Apr 16 14:57:40 2009
@@ -845,9 +845,9 @@
 
 			Throwable rootCause = null;
 			if (t instanceof JspException) {
-				rootCause = ((JspException) t).getRootCause();
+				rootCause = ((JspException) t).getCause();
 			} else if (t instanceof ELException) {
-				rootCause = ((ELException) t).getRootCause();
+				rootCause = ((ELException) t).getCause();
 			}
 
 			if (rootCause != null) {



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