diff --git a/jetty-io/src/test/resources/jetty-logging.properties b/jetty-io/src/test/resources/jetty-logging.properties index d4922ad1951..1dd07407e8c 100644 --- a/jetty-io/src/test/resources/jetty-logging.properties +++ b/jetty-io/src/test/resources/jetty-logging.properties @@ -1,2 +1,3 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog org.eclipse.jetty.LEVEL=INFO + diff --git a/jetty-spdy/spdy-http-server/src/test/resources/jetty-logging.properties b/jetty-spdy/spdy-http-server/src/test/resources/jetty-logging.properties index 996b638b001..c8c756e3a78 100644 --- a/jetty-spdy/spdy-http-server/src/test/resources/jetty-logging.properties +++ b/jetty-spdy/spdy-http-server/src/test/resources/jetty-logging.properties @@ -1,3 +1,5 @@ org.eclipse.jetty.util.log.class=org.eclipse.jetty.util.log.StdErrLog #org.eclipse.jetty.spdy.LEVEL=DEBUG #org.eclipse.jetty.server.LEVEL=DEBUG +#org.eclipse.jetty.io.ssl.LEVEL=DEBUG +#org.eclipse.jetty.spdy.server.LEVEL=DEBUG 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 574515614ed..4bb8fa839ed 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 @@ -35,7 +35,7 @@ import org.eclipse.jetty.util.log.Logger; public class NextProtoNegoServerConnection extends AbstractConnection implements NextProtoNego.ServerProvider { - private final Logger logger = Log.getLogger(getClass()); + private final Logger LOG = Log.getLogger(getClass()); private final Connector connector; private final SSLEngine engine; private final List protocols; @@ -78,6 +78,9 @@ public class NextProtoNegoServerConnection extends AbstractConnection implements if (filled <= 0 || completed) break; } + + if (completed) + getEndPoint().getConnection().onOpen(); } private int fill() @@ -88,7 +91,7 @@ public class NextProtoNegoServerConnection extends AbstractConnection implements } catch (IOException x) { - logger.debug(x); + LOG.debug(x); getEndPoint().close(); return -1; } @@ -109,13 +112,13 @@ public class NextProtoNegoServerConnection extends AbstractConnection implements @Override public void protocolSelected(String protocol) { + LOG.debug("{} protocolSelected {}",this,protocol); NextProtoNego.remove(engine); ConnectionFactory connectionFactory = connector.getConnectionFactory(protocol); EndPoint endPoint = getEndPoint(); endPoint.getConnection().onClose(); Connection connection = connectionFactory.newConnection(connector, endPoint); endPoint.setConnection(connection); - connection.onOpen(); completed = true; } }