aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-10-30 11:33:51 (EDT)
committerThomas Becker2012-10-30 13:48:38 (EDT)
commit1d6ec310b577aab8c9609bb2821790e76315a04d (patch)
tree3ba3b6147dd8741f01f80273821b3777bf8ea83b
parenta1bf37f2a59e3f63cfc21b46b4cfb98c40e88645 (diff)
downloadorg.eclipse.jetty.project-1d6ec310b577aab8c9609bb2821790e76315a04d.zip
org.eclipse.jetty.project-1d6ec310b577aab8c9609bb2821790e76315a04d.tar.gz
org.eclipse.jetty.project-1d6ec310b577aab8c9609bb2821790e76315a04d.tar.bz2
393160: fix connection leaks in NextProtoNegoClientConnection and NextProtoNegoServerConnection
-rw-r--r--jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/NextProtoNegoClientConnection.java1
-rw-r--r--jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/NextProtoNegoClientConnection.java b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/NextProtoNegoClientConnection.java
index c7fda0a..3018c7a 100644
--- a/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/NextProtoNegoClientConnection.java
+++ b/jetty-spdy/spdy-client/src/main/java/org/eclipse/jetty/spdy/client/NextProtoNegoClientConnection.java
@@ -95,6 +95,7 @@ public class NextProtoNegoClientConnection extends AbstractConnection implements
catch (IOException x)
{
LOG.debug(x);
+ NextProtoNego.remove(engine);
getEndPoint().close();
return -1;
}
diff --git a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java
index 40731ad..84d361d 100644
--- a/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java
+++ b/jetty-spdy/spdy-server/src/main/java/org/eclipse/jetty/spdy/server/NextProtoNegoServerConnection.java
@@ -25,7 +25,6 @@ import javax.net.ssl.SSLEngine;
import org.eclipse.jetty.io.AbstractConnection;
import org.eclipse.jetty.io.Connection;
import org.eclipse.jetty.io.EndPoint;
-import org.eclipse.jetty.io.ssl.SslConnection.DecryptedEndPoint;
import org.eclipse.jetty.npn.NextProtoNego;
import org.eclipse.jetty.server.ConnectionFactory;
import org.eclipse.jetty.server.Connector;
@@ -93,6 +92,7 @@ public class NextProtoNegoServerConnection extends AbstractConnection implements
catch (IOException x)
{
LOG.debug(x);
+ NextProtoNego.remove(engine);
getEndPoint().close();
return -1;
}