Mercurial Hosting > luan

changeset 1003:21910079096e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor
author Franklin Schmidt <fschmidt@gmail.com>
date Sat, 22 Oct 2016 22:24:47 -0600
parents 35d04ac3fd0b
children 3fa54d9d19cd
files src/org/eclipse/jetty/io/nio/SslConnection.java src/org/eclipse/jetty/server/AsyncHttpConnection.java src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
diff -r 35d04ac3fd0b -r 21910079096e src/org/eclipse/jetty/io/nio/SslConnection.java
--- a/src/org/eclipse/jetty/io/nio/SslConnection.java	Sat Oct 22 21:56:44 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SslConnection.java	Sat Oct 22 22:24:47 2016 -0600
@@ -32,6 +32,7 @@
 import org.eclipse.jetty.io.AsyncEndPoint;
 import org.eclipse.jetty.io.Buffer;
 import org.eclipse.jetty.io.EndPoint;
+import org.eclipse.jetty.server.AsyncHttpConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +55,7 @@
 	private static final ThreadLocal<SslBuffers> __buffers = new ThreadLocal<SslBuffers>();
 	private final SSLEngine _engine;
 	private final SSLSession _session;
-	private AsyncConnection _connection;
+	private AsyncHttpConnection _connection;
 	private final SslEndPoint _sslEndPoint;
 	private int _allocations;
 	private SslBuffers _buffers;
@@ -723,7 +724,7 @@
 			_aEndp.setMaxIdleTime(timeMs);
 		}
 
-		public void setConnection(AsyncConnection connection)
+		public void setConnection(AsyncHttpConnection connection)
 		{
 			_connection = connection;
 		}
diff -r 35d04ac3fd0b -r 21910079096e src/org/eclipse/jetty/server/AsyncHttpConnection.java
--- a/src/org/eclipse/jetty/server/AsyncHttpConnection.java	Sat Oct 22 21:56:44 2016 -0600
+++ b/src/org/eclipse/jetty/server/AsyncHttpConnection.java	Sat Oct 22 22:24:47 2016 -0600
@@ -152,7 +152,7 @@
 	}
 
 	@Override
-	public void onInputShutdown() throws IOException
+	public final void onInputShutdown() throws IOException
 	{
 		// If we don't have a committed response and we are not suspended
 		if (_generator.isIdle())
diff -r 35d04ac3fd0b -r 21910079096e src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
--- a/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java	Sat Oct 22 21:56:44 2016 -0600
+++ b/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java	Sat Oct 22 22:24:47 2016 -0600
@@ -39,6 +39,7 @@
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.AbstractHttpConnection;
+import org.eclipse.jetty.server.AsyncHttpConnection;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
 import org.eclipse.jetty.util.component.AggregateLifeCycle;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
@@ -145,7 +146,7 @@
 		{
 			SSLEngine engine = createSSLEngine(channel);
 			SslConnection connection = new SslConnection(engine, endpoint);
-			AsyncConnection delegate = super.newConnection(channel, connection.getSslEndPoint());
+			AsyncHttpConnection delegate = (AsyncHttpConnection)super.newConnection(channel, connection.getSslEndPoint());
 			connection.getSslEndPoint().setConnection(delegate);
 			connection.setAllowRenegotiate(_sslContextFactory.isAllowRenegotiate());
 			return connection;