--- a/src/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java	Sun Oct 09 03:45:31 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/IdleTimeoutHandler.java	Sun Oct 09 03:51:31 2016 -0600
@@ -46,93 +46,63 @@
  */
 public class IdleTimeoutHandler extends HandlerWrapper
 {
-    private int _idleTimeoutMs = 1000;
-    private boolean _applyToAsync = false;
-    
-    
-    public boolean isApplyToAsync()
-    {
-        return _applyToAsync;
-    }
+	private int _idleTimeoutMs = 1000;
+	private boolean _applyToAsync = false;
+	
+	
+	public boolean isApplyToAsync()
+	{
+		return _applyToAsync;
+	}
 
-    /**
-     * Should the adjusted idle time be maintained for asynchronous requests
-     * @param applyToAsync true if alternate idle timeout is applied to asynchronous requests
-     */
-    public void setApplyToAsync(boolean applyToAsync)
-    {
-        _applyToAsync = applyToAsync;
-    }
+	/**
+	 * Should the adjusted idle time be maintained for asynchronous requests
+	 * @param applyToAsync true if alternate idle timeout is applied to asynchronous requests
+	 */
+	public void setApplyToAsync(boolean applyToAsync)
+	{
+		_applyToAsync = applyToAsync;
+	}
 
-    public long getIdleTimeoutMs()
-    {
-        return _idleTimeoutMs;
-    }
+	public long getIdleTimeoutMs()
+	{
+		return _idleTimeoutMs;
+	}
 
-    /**
-     * @param idleTimeoutMs The idle timeout in MS to apply while dispatched or async
-     */
-    public void setIdleTimeoutMs(int _idleTimeoutMs)
-    {
-        this._idleTimeoutMs = _idleTimeoutMs;
-    }
-    
+	/**
+	 * @param idleTimeoutMs The idle timeout in MS to apply while dispatched or async
+	 */
+	public void setIdleTimeoutMs(int _idleTimeoutMs)
+	{
+		this._idleTimeoutMs = _idleTimeoutMs;
+	}
+	
    
-    @Override
-    public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
-    {
-        AbstractHttpConnection connection = AbstractHttpConnection.getCurrentConnection();
-        final EndPoint endp = connection==null?null:connection.getEndPoint();
-        
-        final int idle_timeout;
-        if (endp==null)
-            idle_timeout=-1;
-        else
-        {
-            idle_timeout=endp.getMaxIdleTime();
-            endp.setMaxIdleTime(_idleTimeoutMs);
-        }
-        
-        try
-        {
-            super.handle(target,baseRequest,request,response);
-        }
-        finally
-        {
-            if (endp!=null)
-            {
-                if (_applyToAsync && request.isAsyncStarted())
-                {
-                    request.getAsyncContext().addListener(new AsyncListener()
-                    {
-                        @Override
-                        public void onTimeout(AsyncEvent event) throws IOException
-                        {                            
-                        }
-                        
-                        @Override
-                        public void onStartAsync(AsyncEvent event) throws IOException
-                        {
-                        }
-                        
-                        @Override
-                        public void onError(AsyncEvent event) throws IOException
-                        {
-                            endp.setMaxIdleTime(idle_timeout);
-                        }
-                        
-                        @Override
-                        public void onComplete(AsyncEvent event) throws IOException
-                        {
-                            endp.setMaxIdleTime(idle_timeout);
-                        }
-                    });
-                }
-                else 
-                {
-                    endp.setMaxIdleTime(idle_timeout);
-                }
-            }
-        }
-    }
+	@Override
+	public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException
+	{
+		AbstractHttpConnection connection = AbstractHttpConnection.getCurrentConnection();
+		final EndPoint endp = connection==null?null:connection.getEndPoint();
+		
+		final int idle_timeout;
+		if (endp==null)
+			idle_timeout=-1;
+		else
+		{
+			idle_timeout=endp.getMaxIdleTime();
+			endp.setMaxIdleTime(_idleTimeoutMs);
+		}
+		
+		try
+		{
+			super.handle(target,baseRequest,request,response);
+		}
+		finally
+		{
+			if (endp!=null)
+			{
+				endp.setMaxIdleTime(idle_timeout);
+			}
+		}
+	}
 }