You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/06/28 17:16:34 UTC
svn commit: r551594 -
/geronimo/specs/branches/geronimo-servlet_2.5_spec-1.1/src/main/java/javax/servlet/ServletException.java
Author: pmcmahan
Date: Thu Jun 28 08:16:33 2007
New Revision: 551594
URL: http://svn.apache.org/viewvc?view=rev&rev=551594
Log:
GERONIMO-3182 resynch javax.servlet.ServletException with original version copied from tomcat6
resynched the src by typing this command in src/main/java/javax/servlet:
svn merge -r 467222:467996 http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/java/javax/servlet .
Thanks Alexander Zynevich for reporting the problem and providing very helpful patch and debug information.
Modified:
geronimo/specs/branches/geronimo-servlet_2.5_spec-1.1/src/main/java/javax/servlet/ServletException.java
Modified: geronimo/specs/branches/geronimo-servlet_2.5_spec-1.1/src/main/java/javax/servlet/ServletException.java
URL: http://svn.apache.org/viewvc/geronimo/specs/branches/geronimo-servlet_2.5_spec-1.1/src/main/java/javax/servlet/ServletException.java?view=diff&rev=551594&r1=551593&r2=551594
==============================================================================
--- geronimo/specs/branches/geronimo-servlet_2.5_spec-1.1/src/main/java/javax/servlet/ServletException.java (original)
+++ geronimo/specs/branches/geronimo-servlet_2.5_spec-1.1/src/main/java/javax/servlet/ServletException.java Thu Jun 28 08:16:33 2007
@@ -26,30 +26,15 @@
*
* @author Various
* @version $Version$
- *
*/
-
-
public class ServletException extends Exception {
- private Throwable rootCause;
-
-
-
-
-
/**
* Constructs a new servlet exception.
- *
*/
-
public ServletException() {
- super();
+ super();
}
-
-
-
-
/**
* Constructs a new servlet exception with the
@@ -59,16 +44,10 @@
* @param message a <code>String</code>
* specifying the text of
* the exception message
- *
*/
-
public ServletException(String message) {
- super(message);
+ super(message);
}
-
-
-
-
/**
* Constructs a new servlet exception when the servlet
@@ -76,7 +55,6 @@
* about the "root cause" exception that interfered with its
* normal operation, including a description message.
*
- *
* @param message a <code>String</code> containing
* the text of the exception message
*
@@ -84,18 +62,11 @@
* that interfered with the servlet's
* normal operation, making this servlet
* exception necessary
- *
*/
-
public ServletException(String message, Throwable rootCause) {
- super(message);
- this.rootCause = rootCause;
+ super(message, rootCause);
}
-
-
-
-
/**
* Constructs a new servlet exception when the servlet
* needs to throw an exception and include a message
@@ -113,33 +84,18 @@
* that interfered with the servlet's
* normal operation, making the servlet exception
* necessary
- *
*/
-
public ServletException(Throwable rootCause) {
- super(rootCause.getLocalizedMessage());
- this.rootCause = rootCause;
+ super(rootCause);
}
-
-
-
-
-
+
/**
* Returns the exception that caused this servlet exception.
*
- *
* @return the <code>Throwable</code>
* that caused this servlet exception
- *
*/
-
public Throwable getRootCause() {
- return rootCause;
+ return getCause();
}
}
-
-
-
-
-