svn commit: r1398505 - in /camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty: BaseJettyTest.java JettyEnableJmxTest.java

[cmueller]

Author: cmueller
Date: Mon Oct 15 20:49:00 2012
New Revision: 1398505

URL: http://svn.apache.org/viewvc?rev=1398505&view=rev
Log:
fixed issue with already assigned port numbers

Modified:
    
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
    
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java

Modified: 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java?rev=1398505&r1=1398504&r2=1398505&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
 Mon Oct 15 20:49:00 2012
@@ -19,6 +19,7 @@ package org.apache.camel.component.jetty
 import java.io.File;
 import java.io.FileOutputStream;
 import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.properties.PropertiesComponent;
@@ -29,12 +30,12 @@ import org.apache.camel.test.junit4.Came
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
-/**
- * @version
- */
 public abstract class BaseJettyTest extends CamelTestSupport {
+
     private static volatile int port;
 
+    private final AtomicInteger counter = new AtomicInteger(1);
+
     @BeforeClass
     public static void initPort() throws Exception {
         File file = new File("./target/jettyport.txt");
@@ -86,8 +87,11 @@ public abstract class BaseJettyTest exte
     }
 
     protected int getNextPort() {
-        port = AvailablePortFinder.getNextAvailable(port + 1);
-        return port;
+        return AvailablePortFinder.getNextAvailable(port + 
counter.getAndIncrement());
+    }
+
+    protected int getNextPort(int startWithPort) {
+        return AvailablePortFinder.getNextAvailable(startWithPort);
     }
 
     protected int getPort() {

Modified: 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java?rev=1398505&r1=1398504&r2=1398505&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
 Mon Oct 15 20:49:00 2012
@@ -112,7 +112,7 @@ public class JettyEnableJmxTest extends 
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
-                serverUri0 = "http://localhost:"; + getPort() + 
"/myservice?enableJmx=true";
+                serverUri0 = "http://localhost:"; + getNextPort() + 
"/myservice?enableJmx=true";
                 serverUri1 = "http://localhost:"; + getNextPort() + 
"/myservice?enableJmx=true";
                 serverUri2 = "http://localhost:"; + getNextPort() + 
"/myservice?enableJmx=false";
                 serverUri3 = "http://localhost:"; + getNextPort() + 
"/myservice?enableJmx=false";