jetty-9 finished refactor for oneconnector and configuration pluggability

2 files changed, 2 insertions, 4 deletions

diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
index 6016dd2688..f5b83019dd 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractConnector.java
@@ -324,9 +324,9 @@ public abstract class AbstractConnector extends AggregateLifeCycle implements Co
 
     public void setDefaultProtocol(String defaultProtocol)
     {
-        if(isRunning())
-            throw new IllegalStateException(getState());
         _defaultProtocol = defaultProtocol.toLowerCase();
+        if (isRunning())
+            _defaultConnectionFactory=getConnectionFactory(_defaultProtocol);
     }
 
     @Override
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java b/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java
index daf25bba67..3109b03820 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/SslConnectionFactory.java
@@ -86,8 +86,6 @@ public class SslConnectionFactory extends AbstractConnectionFactory
         Connection connection = next.newConnection(connector, decrypted_endp);
         
         decrypted_endp.setConnection(connection);
-        connection.onOpen();
-
         return sslConnection;
     }