updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / server / handler / IdleTimeoutHandler.java

diff --git a/lib/jetty/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java b/lib/jetty/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java
index 04a90f17bc5840d94b5606a4016f84fbda08447b..9cbc84c45867d0d50240a0e01ac6d6e1ae9f68ac 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java
+++ b/lib/jetty/org/eclipse/jetty/server/handler/IdleTimeoutHandler.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
@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.server.HttpChannel;
 import org.eclipse.jetty.server.HttpConnection;
 import org.eclipse.jetty.server.Request;
 
@@ -79,17 +80,9 @@ public class IdleTimeoutHandler extends HandlerWrapper
     @Override
     public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
     {
-        HttpConnection connection = HttpConnection.getCurrentConnection();
-        final EndPoint endp = connection==null?null:connection.getEndPoint();
-        
-        final long idle_timeout;
-        if (endp==null)
-            idle_timeout=-1;
-        else
-        {
-            idle_timeout=endp.getIdleTimeout();
-            endp.setIdleTimeout(_idleTimeoutMs);
-        }
+        final HttpChannel<?> channel = baseRequest.getHttpChannel();
+        final long idle_timeout=baseRequest.getHttpChannel().getIdleTimeout();
+        channel.setIdleTimeout(_idleTimeoutMs);
         
         try
         {
@@ -97,8 +90,6 @@ public class IdleTimeoutHandler extends HandlerWrapper
         }
         finally
         {
-            if (endp!=null)
-            {
                 if (_applyToAsync && request.isAsyncStarted())
                 {
                     request.getAsyncContext().addListener(new AsyncListener()
@@ -116,19 +107,18 @@ public class IdleTimeoutHandler extends HandlerWrapper
                         @Override
                         public void onError(AsyncEvent event) throws IOException
                         {
-                            endp.setIdleTimeout(idle_timeout);
+                            channel.setIdleTimeout(idle_timeout);
                         }
                         
                         @Override
                         public void onComplete(AsyncEvent event) throws IOException
                         {
-                            endp.setIdleTimeout(idle_timeout);
+                            channel.setIdleTimeout(idle_timeout);
                         }
                     });
                 }
                 else 
-                    endp.setIdleTimeout(idle_timeout);
-            }
+                    channel.setIdleTimeout(idle_timeout);
         }
     }
 }