updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / servlet / FilterMapping.java

diff --git a/lib/jetty/org/eclipse/jetty/servlet/FilterMapping.java b/lib/jetty/org/eclipse/jetty/servlet/FilterMapping.java
index 1d5a9a4205473f69c0b488539cd7a6ffaa5f67ff..749928cb8ff826cc0a557524d3e58f84ea0abb37 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/servlet/FilterMapping.java
+++ b/lib/jetty/org/eclipse/jetty/servlet/FilterMapping.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
 //
 //  ========================================================================

-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.

 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0


@@ -24,7 +24,6 @@ import java.util.EnumSet;
 import javax.servlet.DispatcherType;
 
 import org.eclipse.jetty.http.PathMap;
 import javax.servlet.DispatcherType;
 
 import org.eclipse.jetty.http.PathMap;

-import org.eclipse.jetty.server.Handler;

 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;
 import org.eclipse.jetty.util.TypeUtil;
 import org.eclipse.jetty.util.annotation.ManagedAttribute;
 import org.eclipse.jetty.util.annotation.ManagedObject;


@@ -67,19 +66,19 @@ public class FilterMapping implements Dumpable
      */
     public static int dispatch(DispatcherType type)
     {
      */
     public static int dispatch(DispatcherType type)
     {

-       switch(type)
-       {
-         case REQUEST:
-                 return REQUEST;
-         case ASYNC:
-                 return ASYNC;
-         case FORWARD:
-                 return FORWARD;
-         case INCLUDE:
-                 return INCLUDE;
-         case ERROR:
-                 return ERROR;
-       }
+        switch(type)
+        {
+          case REQUEST:
+                  return REQUEST;
+          case ASYNC:
+                  return ASYNC;
+          case FORWARD:
+                  return FORWARD;
+          case INCLUDE:
+                  return INCLUDE;
+          case ERROR:
+                  return ERROR;
+        }

         throw new IllegalArgumentException(type.toString());
     }
 
         throw new IllegalArgumentException(type.toString());
     }
 


@@ -124,8 +123,8 @@ public class FilterMapping implements Dumpable
      */
     boolean appliesTo(int type)
     {
      */
     boolean appliesTo(int type)
     {

-       if (_dispatches==0)
-               return type==REQUEST || type==ASYNC && _holder.isAsyncSupported();
+        if (_dispatches==0)
+                return type==REQUEST || type==ASYNC && _holder.isAsyncSupported();

         return (_dispatches&type)!=0;
     }
 
         return (_dispatches&type)!=0;
     }