Mercurial Hosting > luan

changeset 968:0d20943cfea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
remove ConnectedEndPoint
author Franklin Schmidt <fschmidt@gmail.com>
date Fri, 14 Oct 2016 02:37:53 -0600
parents 8a8dc0b1742f
children 0650077fcd6c
files src/org/eclipse/jetty/io/AsyncEndPoint.java src/org/eclipse/jetty/io/ConnectedEndPoint.java src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java src/org/eclipse/jetty/io/nio/SelectorManager.java src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java src/org/eclipse/jetty/server/nio/SelectChannelConnector.java
diffstat 6 files changed, 3 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/src/org/eclipse/jetty/io/AsyncEndPoint.java	Fri Oct 14 02:30:48 2016 -0600
+++ b/src/org/eclipse/jetty/io/AsyncEndPoint.java	Fri Oct 14 02:37:53 2016 -0600
@@ -19,7 +19,7 @@
 package org.eclipse.jetty.io;
 
 
-public interface AsyncEndPoint extends ConnectedEndPoint
+public interface AsyncEndPoint extends EndPoint
 {
 	/* ------------------------------------------------------------ */
 	/**
--- a/src/org/eclipse/jetty/io/ConnectedEndPoint.java	Fri Oct 14 02:30:48 2016 -0600
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-//
-//  ========================================================================
-//  Copyright (c) 1995-2014 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
-//  and Apache License v2.0 which accompanies this distribution.
-//
-//      The Eclipse Public License is available at
-//      http://www.eclipse.org/legal/epl-v10.html
-//
-//      The Apache License v2.0 is available at
-//      http://www.opensource.org/licenses/apache2.0.php
-//
-//  You may elect to redistribute this code under either of these licenses.
-//  ========================================================================
-//
-
-package org.eclipse.jetty.io;
-
-public interface ConnectedEndPoint extends EndPoint
-{
-    void setConnection(Connection connection);
-}
--- a/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java	Fri Oct 14 02:30:48 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java	Fri Oct 14 02:37:53 2016 -0600
@@ -29,7 +29,6 @@
 
 import org.eclipse.jetty.io.AsyncEndPoint;
 import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.io.ConnectedEndPoint;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EofException;
 import org.slf4j.Logger;
@@ -40,7 +39,7 @@
 /**
  * An Endpoint that can be scheduled by {@link SelectorManager}.
  */
-public final class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPoint, ConnectedEndPoint
+public final class SelectChannelEndPoint extends ChannelEndPoint implements AsyncEndPoint
 {
 	public static final Logger LOG=LoggerFactory.getLogger("org.eclipse.jetty.io.nio");
 
@@ -86,7 +85,6 @@
 		_key = key;
 	}
 
-	@Override
 	public void setConnection(Connection connection)
 	{
 		_connection = (AsyncConnection)connection;
--- a/src/org/eclipse/jetty/io/nio/SelectorManager.java	Fri Oct 14 02:30:48 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SelectorManager.java	Fri Oct 14 02:37:53 2016 -0600
@@ -37,7 +37,6 @@
 import java.util.concurrent.TimeUnit;
 
 import org.eclipse.jetty.io.AsyncEndPoint;
-import org.eclipse.jetty.io.ConnectedEndPoint;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.util.TypeUtil;
--- a/src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java	Fri Oct 14 02:30:48 2016 -0600
+++ b/src/org/eclipse/jetty/server/nio/BlockingChannelConnector.java	Fri Oct 14 02:37:53 2016 -0600
@@ -31,7 +31,6 @@
 
 import org.eclipse.jetty.http.HttpException;
 import org.eclipse.jetty.io.Buffer;
-import org.eclipse.jetty.io.ConnectedEndPoint;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.EofException;
@@ -139,7 +138,7 @@
 	}
 
 
-	private class BlockingChannelEndPoint extends ChannelEndPoint implements Runnable, ConnectedEndPoint
+	private class BlockingChannelEndPoint extends ChannelEndPoint implements Runnable
 	{
 		private Connection _connection;
 		private int _timeout;
--- a/src/org/eclipse/jetty/server/nio/SelectChannelConnector.java	Fri Oct 14 02:30:48 2016 -0600
+++ b/src/org/eclipse/jetty/server/nio/SelectChannelConnector.java	Fri Oct 14 02:37:53 2016 -0600
@@ -26,7 +26,6 @@
 import java.nio.channels.SocketChannel;
 
 import org.eclipse.jetty.io.AsyncEndPoint;
-import org.eclipse.jetty.io.ConnectedEndPoint;
 import org.eclipse.jetty.io.Connection;
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.nio.AsyncConnection;