Mercurial Hosting > luan
changeset 969:0650077fcd6c
remove SelectChannelEndPoint.setConnection()
| author | Franklin Schmidt <fschmidt@gmail.com> |
|---|---|
| date | Fri, 14 Oct 2016 02:44:02 -0600 |
| parents | 0d20943cfea2 |
| children | d82eb99e8df6 |
| files | src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java src/org/eclipse/jetty/io/nio/SelectorManager.java |
| diffstat | 2 files changed, 2 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
diff -r 0d20943cfea2 -r 0650077fcd6c src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java --- a/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java Fri Oct 14 02:37:53 2016 -0600 +++ b/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java Fri Oct 14 02:44:02 2016 -0600 @@ -56,7 +56,7 @@ * ProxyConnect. The connection may change for an SCEP as it is upgraded * from HTTP to proxy connect or websocket. */ - private volatile AsyncConnection _connection; + private final AsyncConnection _connection; /* private static final int STATE_NEEDS_DISPATCH = -1; private static final int STATE_UNDISPATCHED = 0; @@ -83,11 +83,7 @@ _manager = manager; _key = key; - } - - public void setConnection(Connection connection) - { - _connection = (AsyncConnection)connection; + _connection = manager.newConnection(channel,this); } /* ------------------------------------------------------------ */
diff -r 0d20943cfea2 -r 0650077fcd6c src/org/eclipse/jetty/io/nio/SelectorManager.java --- a/src/org/eclipse/jetty/io/nio/SelectorManager.java Fri Oct 14 02:37:53 2016 -0600 +++ b/src/org/eclipse/jetty/io/nio/SelectorManager.java Fri Oct 14 02:44:02 2016 -0600 @@ -87,7 +87,6 @@ try { SelectionKey key = _selector.register(channel,0,null); SelectChannelEndPoint endpoint = new SelectChannelEndPoint(channel,this,key, _maxIdleTime); - endpoint.setConnection(newConnection(channel,endpoint)); key.attach(endpoint); _selector.update(); //System.out.println("qqqqqqqqqqqqqqqqqqqqqqqqqqqqq b");