Mercurial Hosting > luan

changeset 974:7422ca1ae146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove Connection.isIdle()
author Franklin Schmidt <fschmidt@gmail.com>
date Sat, 15 Oct 2016 23:27:08 -0600
parents 4d9fe9cc554d
children 53b3f7d9714c
files src/org/eclipse/jetty/io/AbstractConnection.java src/org/eclipse/jetty/io/Connection.java src/org/eclipse/jetty/io/nio/SslConnection.java src/org/eclipse/jetty/server/AbstractHttpConnection.java src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java
diffstat 5 files changed, 2 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/src/org/eclipse/jetty/io/AbstractConnection.java	Sat Oct 15 23:03:00 2016 -0600
+++ b/src/org/eclipse/jetty/io/AbstractConnection.java	Sat Oct 15 23:27:08 2016 -0600
@@ -39,10 +39,4 @@
 	{
 		return _endp;
 	}
-
-	@Override
-	public String toString()
-	{
-		return String.format("%s@%x", getClass().getSimpleName(), hashCode());
-	}
 }
--- a/src/org/eclipse/jetty/io/Connection.java	Sat Oct 15 23:03:00 2016 -0600
+++ b/src/org/eclipse/jetty/io/Connection.java	Sat Oct 15 23:27:08 2016 -0600
@@ -40,10 +40,4 @@
 	 * @throws IOException if the handling of I/O operations fail
 	 */
 	void handle() throws IOException;
-
-	/**
-	 * @return whether this connection is idle, that is not parsing and not generating
-	 * @see #onIdleExpired(long)
-	 */
-	boolean isIdle();
 }
--- a/src/org/eclipse/jetty/io/nio/SslConnection.java	Sat Oct 15 23:03:00 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SslConnection.java	Sat Oct 15 23:27:08 2016 -0600
@@ -206,11 +206,6 @@
 		}
 	}
 
-	public boolean isIdle()
-	{
-		return false;
-	}
-
 	public boolean isSuspended()
 	{
 		return false;
--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Sat Oct 15 23:03:00 2016 -0600
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Sat Oct 15 23:27:08 2016 -0600
@@ -451,11 +451,6 @@
 		}
 	}
 
-	public final boolean isIdle()
-	{
-		return _generator.isIdle() && (_parser.isIdle() || _delayedHandling);
-	}
-
 	public final boolean isExpecting102Processing()
 	{
 		return _expect102Processing;
@@ -679,7 +674,7 @@
 	{
 		if (_delayedHandling)
 		{
-			_delayedHandling=false;
+			_delayedHandling = false;
 			handleRequest();
 		}
 	}
@@ -688,7 +683,7 @@
 	{
 		if (_delayedHandling)
 		{
-			_delayedHandling=false;
+			_delayedHandling = false;
 			handleRequest();
 		}
 	}
--- a/src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java	Sat Oct 15 23:03:00 2016 -0600
+++ b/src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java	Sat Oct 15 23:27:08 2016 -0600
@@ -224,14 +224,6 @@
 				while (isOpen())
 				{
 					_idleTimestamp=System.currentTimeMillis();
-					if (!_connection.isIdle())
-					{
-						if (_timeout!=getMaxIdleTime())
-						{
-							_timeout=getMaxIdleTime();
-						}
-					}
-
 					_connection.handle();
 
 				}