Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removed redundant setConnection

This commit is contained in:
Greg Wilkins 2011-11-10 12:47:50 +11:00
parent 7504d24e9e
commit 144195d435
4 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
View File

@ -273,7 +273,7 @@ class SelectConnector extends AbstractLifeCycle implements HttpClient.Connector
((SelectChannelEndPoint)_endp).setConnection(sslConnection);
_endp=sslConnection.getSslEndPoint();
sslConnection.setConnection(connection);
sslConnection.getSslEndPoint().setConnection(connection);
LOG.debug("upgrade {} to {} for {}",this,sslConnection,connection);
}

12
jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
View File

@ -98,18 +98,6 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
_aEndp=(AsyncEndPoint)endp;
}
/* ------------------------------------------------------------ */
public synchronized void setConnection(AsyncConnection connection)
{
_connection=connection;
}
/* ------------------------------------------------------------ */
public synchronized AsyncConnection getConnection()
{
return _connection;
}
/* ------------------------------------------------------------ */
/**
* @return True if SSL re-negotiation is allowed (default false)

2
jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
View File

@ -49,7 +49,7 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
SslConnection connection = new SslConnection(engine,endpoint);
AsyncConnection delegate = super.newConnection(channel,connection.getSslEndPoint());
connection.setConnection(delegate);
connection.getSslEndPoint().setConnection(delegate);
return connection;
}

2
jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
View File

@ -559,7 +559,7 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
SslConnection connection = new SslConnection(engine,endpoint);
AsyncConnection delegate = super.newConnection(channel,connection.getSslEndPoint());
connection.setConnection(delegate);
connection.getSslEndPoint().setConnection(delegate);
connection.setAllowRenegotiate(_sslContextFactory.isAllowRenegotiate());
return connection;
}