cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1445742 - /cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Date Wed, 13 Feb 2013 17:08:48 GMT
Author: dkulp
Date: Wed Feb 13 17:08:48 2013
New Revision: 1445742

URL: http://svn.apache.org/r1445742
Log:
Merged revisions 1442715 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

........
  r1442715 | dkulp | 2013-02-05 14:54:18 -0500 (Tue, 05 Feb 2013) | 18 lines

  Merged revisions 1442706 via  git cherry-pick from
  https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes

  ........
    r1442706 | dkulp | 2013-02-05 14:30:10 -0500 (Tue, 05 Feb 2013) | 10 lines

    Merged revisions 1442704 via  git cherry-pick from
    https://svn.apache.org/repos/asf/cxf/trunk

    ........
      r1442704 | dkulp | 2013-02-05 14:28:34 -0500 (Tue, 05 Feb 2013) | 2 lines

      [CXF-4806] Use instanceof SslConnector instead of the specific subclass

    ........

  ........

........

Modified:
    cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java

Modified: cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java?rev=1445742&r1=1445741&r2=1445742&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
(original)
+++ cxf/branches/2.5.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
Wed Feb 13 17:08:48 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.");
             }



Mime
View raw message