cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1493911 - in /cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src: main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
Date Mon, 17 Jun 2013 20:07:03 GMT
Author: dkulp
Date: Mon Jun 17 20:07:03 2013
New Revision: 1493911

URL: http://svn.apache.org/r1493911
Log:
Merged revisions 1484660 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1484660 | ningjiang | 2013-05-21 00:13:29 -0400 (Tue, 21 May 2013) | 2 lines

  polish the code of JettyHTTPDestination

........

Modified:
    cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
    cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java

Modified: cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java?rev=1493911&r1=1493910&r2=1493911&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
Mon Jun 17 20:07:03 2013
@@ -85,13 +85,13 @@ public class JettyHTTPDestination extend
     private boolean configFinalized;
      
     /**
-     * Constructor, using Jetty server engine.
-     * 
-     * @param b the associated Bus
-     * @param ci the associated conduit initiator
-     * @param endpointInfo the endpoint info of the destination
-     * @param serverEngineFactory 
-     * @throws IOException
+     * Constructor
+     *
+     * @param b  the associated Bus
+     * @param registry the associated destinationRegistry
+     * @param ei the endpoint info of the destination
+     * @param serverEngineFactory the serverEngineFactory which could be used to create ServerEngine
+     * @throws java.io.IOException
      */
     public JettyHTTPDestination(
             Bus bus,
@@ -99,7 +99,7 @@ public class JettyHTTPDestination extend
             EndpointInfo ei, 
             JettyHTTPServerEngineFactory serverEngineFactory
     ) throws IOException {
-        //Add the defualt port if the address is missing it
+        //Add the default port if the address is missing it
         super(bus, registry, ei, getAddressValue(ei, true).getAddress(), true);
         this.serverEngineFactory = serverEngineFactory;
         nurl = new URL(endpointInfo.getAddress());

Modified: cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java?rev=1493911&r1=1493910&r2=1493911&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http-jetty/src/test/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngineTest.java
Mon Jun 17 20:07:03 2013
@@ -99,7 +99,7 @@ public class JettyHTTPServerEngineTest e
             "Engine references for the same port should point to the same instance",
             engine == factory.retrieveJettyHTTPServerEngine(PORT1));
 
-        JettyHTTPServerEngineFactory.destroyForPort(1234);
+        JettyHTTPServerEngineFactory.destroyForPort(PORT1);
     }
 
     @Test



Mime
View raw message