aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-12-12 13:27:31 (EST)
committerThomas Becker2012-12-12 13:31:44 (EST)
commit36ec5bb756bb508bc026efc404072c035a5db7a2 (patch)
treea3e1f6d639a0ba2c70a254c0c9673289f5a55bbe
parent9bbfcd7e62cf1d19c309869073817d1d1093af64 (diff)
downloadorg.eclipse.jetty.project-36ec5bb756bb508bc026efc404072c035a5db7a2.zip
org.eclipse.jetty.project-36ec5bb756bb508bc026efc404072c035a5db7a2.tar.gz
org.eclipse.jetty.project-36ec5bb756bb508bc026efc404072c035a5db7a2.tar.bz2
393220 remove dead code from ServletHandler and log ServletExceptions in warn instead of debug
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java17
1 files changed, 6 insertions, 11 deletions
diff --git a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
index f976002..0eb5d58 100644
--- a/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
+++ b/jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
@@ -36,11 +36,16 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.concurrent.ConcurrentMap;
+<<<<<<< HEAD
import javax.servlet.DispatcherType;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterRegistration;
import javax.servlet.RequestDispatcher;
+=======
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+>>>>>>> b1a7779... 393220 remove dead code from ServletHandler and log ServletExceptions in warn instead of debug
import javax.servlet.Servlet;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
@@ -485,22 +490,12 @@ public class ServletHandler extends ScopedHandler
}
else if (th instanceof ServletException)
{
- LOG.debug(th);
+ LOG.warn(th);
Throwable cause=((ServletException)th).getRootCause();
if (cause!=null)
th=cause;
}
- else if (th instanceof RuntimeIOException)
- {
- LOG.debug(th);
- Throwable cause= th.getCause();
- if (cause!=null)
- th=cause;
- }
-
// handle or log exception
- else if (th instanceof RuntimeIOException)
- throw (RuntimeIOException)th;
else if (th instanceof EofException)
throw (EofException)th;