aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-12-12 13:45:31 (EST)
committerThomas Becker2012-12-12 13:45:31 (EST)
commit3380b466b440c22145deb8f4f4a9a7dbb970b330 (patch)
tree7018390c86a4574e1881960cd6b7580f257e3cd8
parent36ec5bb756bb508bc026efc404072c035a5db7a2 (diff)
downloadorg.eclipse.jetty.project-3380b466b440c22145deb8f4f4a9a7dbb970b330.zip
org.eclipse.jetty.project-3380b466b440c22145deb8f4f4a9a7dbb970b330.tar.gz
org.eclipse.jetty.project-3380b466b440c22145deb8f4f4a9a7dbb970b330.tar.bz2
fix merge issue
-rw-r--r--jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java18
1 files changed, 0 insertions, 18 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 0eb5d58..dc6ca86 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
@@ -19,15 +19,10 @@
package org.eclipse.jetty.servlet;
import java.io.IOException;
-import java.io.InputStream;
-import java.net.MalformedURLException;
-import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
-import java.util.Enumeration;
-import java.util.EventListener;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -36,28 +31,18 @@ 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;
import javax.servlet.ServletRegistration;
-import javax.servlet.ServletRegistration.Dynamic;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.ServletSecurityElement;
-import javax.servlet.SessionCookieConfig;
-import javax.servlet.SessionTrackingMode;
import javax.servlet.UnavailableException;
-import javax.servlet.descriptor.JspConfigDescriptor;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -69,18 +54,15 @@ import org.eclipse.jetty.security.SecurityHandler;
import org.eclipse.jetty.server.Dispatcher;
import org.eclipse.jetty.server.HttpChannel;
import org.eclipse.jetty.server.Request;
-import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServletRequestHttpWrapper;
import org.eclipse.jetty.server.ServletResponseHttpWrapper;
import org.eclipse.jetty.server.UserIdentity;
import org.eclipse.jetty.server.handler.ContextHandler;
import org.eclipse.jetty.server.handler.ScopedHandler;
import org.eclipse.jetty.util.ArrayUtil;
-import org.eclipse.jetty.util.AttributesMap;
import org.eclipse.jetty.util.LazyList;
import org.eclipse.jetty.util.MultiException;
import org.eclipse.jetty.util.MultiMap;
-import org.eclipse.jetty.util.TypeUtil;
import org.eclipse.jetty.util.URIUtil;
import org.eclipse.jetty.util.annotation.ManagedAttribute;
import org.eclipse.jetty.util.annotation.ManagedObject;