You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/02/05 20:28:34 UTC
svn commit: r1442704 -
/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Author: dkulp
Date: Tue Feb 5 19:28:34 2013
New Revision: 1442704
URL: http://svn.apache.org/viewvc?rev=1442704&view=rev
Log:
[CXF-4806] Use instanceof SslConnector instead of the specific subclass
Modified:
cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Modified: cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1442704&r1=1442703&r2=1442704&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java (original)
+++ cxf/trunk/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java Tue Feb 5 19:28:34 2013
@@ -51,7 +51,7 @@ import org.eclipse.jetty.server.nio.Sele
import org.eclipse.jetty.server.session.HashSessionIdManager;
import org.eclipse.jetty.server.session.HashSessionManager;
import org.eclipse.jetty.server.session.SessionHandler;
-import org.eclipse.jetty.server.ssl.SslSocketConnector;
+import org.eclipse.jetty.server.ssl.SslConnector;
import org.eclipse.jetty.util.component.Container;
import org.eclipse.jetty.util.thread.QueuedThreadPool;
import org.eclipse.jetty.util.thread.ThreadPool;
@@ -604,7 +604,7 @@ public class JettyHTTPServerEngine
protected void retrieveListenerFactory() {
if (tlsServerParameters != null) {
- if (null != connector && !(connector instanceof SslSocketConnector)) {
+ if (null != connector && !(connector instanceof SslConnector)) {
LOG.warning("Connector " + connector + " for JettyServerEngine Port "
+ port + " does not support SSL connections.");
return;
@@ -614,7 +614,7 @@ public class JettyHTTPServerEngine
protocol = "https";
} else {
- if (connector instanceof SslSocketConnector) {
+ if (connector instanceof SslConnector) {
throw new RuntimeException("Connector " + connector + " for JettyServerEngine Port "
+ port + " does not support non-SSL connections.");
}