From c226f9c5a83f954d2bcd4a69b0f7c86fc27cd2c5 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Tue, 12 Apr 2011 04:18:59 +0000 Subject: [PATCH] JETTY-1362 Set root cause of UnavailableException git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3002 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../java/org/eclipse/jetty/servlet/ServletHolder.java | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/VERSION.txt b/VERSION.txt index 0810246f61c..46065ce6423 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,5 +1,6 @@ jetty-7.4.0-SNAPSHOT + 342504 Scanner Listener + + JETTY-1362 Set root cause of UnavailableException jetty-7.4.0.RC0 + 324110 Added test harnesses for merging of QueryStrings. diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java index d5242f8e3fc..1efd9613bbd 100644 --- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java +++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java @@ -395,18 +395,22 @@ public class ServletHolder extends Holder implements UserIdentity.Scope _unavailable=System.currentTimeMillis()+5000; // TODO configure } } - /* ------------------------------------------------------------ */ - private void makeUnavailable(Throwable e) + private void makeUnavailable(final Throwable e) { if (e instanceof UnavailableException) makeUnavailable((UnavailableException)e); else { _servletHandler.getServletContext().log("unavailable",e); - _unavailableEx=new UnavailableException(String.valueOf(e),-1); + _unavailableEx=new UnavailableException(String.valueOf(e),-1) + { + { + initCause(e); + } + }; _unavailable=-1; } }