Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2011-04-12 00:18:59 -0400
committerGreg Wilkins2011-04-12 00:18:59 -0400
commitc226f9c5a83f954d2bcd4a69b0f7c86fc27cd2c5 (patch)
treef87718230790d899d09e59e9c4980e49e1a2ef09
parentfb92f51f49cfd13419ef870b089db90603138eca (diff)
downloadorg.eclipse.jetty.project-c226f9c5a83f954d2bcd4a69b0f7c86fc27cd2c5.tar.gz
org.eclipse.jetty.project-c226f9c5a83f954d2bcd4a69b0f7c86fc27cd2c5.tar.xz
org.eclipse.jetty.project-c226f9c5a83f954d2bcd4a69b0f7c86fc27cd2c5.zip
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
-rw-r--r--VERSION.txt1
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java10
2 files changed, 8 insertions, 3 deletions
diff --git a/VERSION.txt b/VERSION.txt
index 0810246f61..46065ce642 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 d5242f8e3f..1efd9613bb 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<Servlet> 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;
}
}

Back to the top