svn commit: r1778819 - /axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java

[veithen]

Author: veithen
Date: Sat Jan 14 19:04:53 2017
New Revision: 1778819

URL: http://svn.apache.org/viewvc?rev=1778819&view=rev
Log:
Let Jetty choose a port instead of using PortAllocator.

Modified:
    
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java?rev=1778819&r1=1778818&r2=1778819&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-integration/src/main/java/org/apache/axis2/integration/JettyServer.java
 Sat Jan 14 19:04:53 2017
@@ -28,7 +28,6 @@ import org.junit.rules.ExternalResource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.testutils.PortAllocator;
 import org.apache.axis2.transport.http.AxisServlet;
 
 /**
@@ -103,11 +102,8 @@ public class JettyServer extends Externa
     
     @Override
     protected void before() throws Throwable {
-        int port = this.port == 0 ? PortAllocator.allocatePort() : this.port;
-        
         server = new Server();
         
-        logger.info("Starting server on port: " + port);
         if (!secure) {
             SelectChannelConnector connector = new SelectChannelConnector();
             connector.setPort(port);
@@ -169,6 +165,8 @@ public class JettyServer extends Externa
                 throw e;
             }
         }
+        
+        logger.info("Server started on port " + getPort());
     }
     
     @Override
@@ -225,7 +223,7 @@ public class JettyServer extends Externa
         for (Connector connector : connectors) {
             if (connector instanceof SelectChannelConnector) {
                 //must be the http connector
-                return connector.getPort();
+                return connector.getLocalPort();
             }
         }