From 0af40c4db2dc01da763f54d7cc02716b02eab218 Mon Sep 17 00:00:00 2001
From: Simone Bordet <simone.bordet@gmail.com>
Date: Sun, 29 Jul 2012 14:57:29 +0200
Subject: [PATCH] Jetty9 - Added lifecycle callbacks for onOpen() for the
 application AsyncConnection linked to the SslConnection.

---
 .../jetty/io/SelectChannelEndPointSslTest.java    | 15 ++++++++-------
 .../org/eclipse/jetty/io/SslConnectionTest.java   |  2 +-
 .../server/ssl/SslSelectChannelConnector.java     |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java
index e3715bc7c5c..71f8c8615da 100644
--- a/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java
+++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SelectChannelEndPointSslTest.java
@@ -1,18 +1,11 @@
 package org.eclipse.jetty.io;
 
-import static org.hamcrest.Matchers.greaterThan;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.net.Socket;
 import java.nio.ByteBuffer;
 import java.nio.channels.SocketChannel;
-
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLEngineResult;
 import javax.net.ssl.SSLEngineResult.HandshakeStatus;
@@ -27,6 +20,12 @@ import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.hamcrest.Matchers.greaterThan;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
 
 public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
 {
@@ -60,6 +59,8 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
 
         AsyncConnection appConnection = super.newConnection(channel,sslConnection.getSslEndPoint());
         sslConnection.getSslEndPoint().setAsyncConnection(appConnection);
+        _manager.connectionOpened(appConnection);
+
         return sslConnection;
     }
 
diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
index 93811256c9b..234829fa00c 100644
--- a/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
+++ b/jetty-io/src/test/java/org/eclipse/jetty/io/SslConnectionTest.java
@@ -56,9 +56,9 @@ public class SslConnectionTest
 
             AsyncConnection appConnection = new TestConnection(sslConnection.getSslEndPoint());
             sslConnection.getSslEndPoint().setAsyncConnection(appConnection);
+            connectionOpened(appConnection);
 
             return sslConnection;
-
         }
 
         @Override
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
index 280da352466..fcbac101887 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
@@ -15,7 +15,6 @@ package org.eclipse.jetty.server.ssl;
 
 import java.io.IOException;
 import java.nio.channels.SocketChannel;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLSession;
@@ -540,6 +539,7 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
             SslConnection connection = newSslConnection(endpoint, engine);
             AsyncConnection delegate = newPlainConnection(channel, connection.getSslEndPoint());
             connection.getSslEndPoint().setAsyncConnection(delegate);
+            getSelectorManager().connectionOpened(delegate);
             return connection;
         }
         catch (IOException e)