Bug 465137 - [http whiteboard] error page exception class handling issues

Signed-off-by: Raymond Auge <raymond.auge@liferay.com>

1 files changed, 23 insertions, 11 deletions

diff --git a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResponseStateHandler.java b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResponseStateHandler.java
index f28442251..a5eca068f 100644
--- a/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResponseStateHandler.java
+++ b/bundles/org.eclipse.equinox.http.servlet/src/org/eclipse/equinox/http/servlet/internal/servlet/ResponseStateHandler.java
@@ -72,18 +72,26 @@ public class ResponseStateHandler {
 				}
 			}
 		}
-		catch (IOException ioe) {
-			setException(ioe);
+		catch (Exception e) {
+			if (!(e instanceof IOException) &&
+				!(e instanceof RuntimeException) &&
+				!(e instanceof ServletException)) {
 
-			if (dispatcherType != DispatcherType.REQUEST) {
-				throw ioe;
+				e = new ServletException(e);
 			}
-		}
-		catch (ServletException se) {
-			setException(se);
+
+			setException(e);
 
 			if (dispatcherType != DispatcherType.REQUEST) {
-				throw se;
+				if (e instanceof RuntimeException) {
+					throw (RuntimeException)e;
+				}
+				else if (e instanceof IOException) {
+					throw (IOException)e;
+				}
+				else if (e instanceof ServletException) {
+					throw (ServletException)e;
+				}
 			}
 		}
 		finally {
@@ -163,11 +171,15 @@ public class ResponseStateHandler {
 			null, className, null, null, null, null, Match.EXACT, null);
 
 		if (errorDispatchTargets == null) {
-			if (exception instanceof ServletException) {
+			if (exception instanceof RuntimeException) {
+				throw (RuntimeException)exception;
+			}
+			else if (exception instanceof IOException) {
+				throw (IOException)exception;
+			}
+			else if (exception instanceof ServletException) {
 				throw (ServletException)exception;
 			}
-
-			throw (IOException)exception;
 		}
 
 		request.setAttribute(RequestDispatcher.ERROR_EXCEPTION, exception);