Author: cmueller
Date: Mon Oct 15 20:47:00 2012
New Revision: 1398504
URL: http://svn.apache.org/viewvc?rev=1398504&view=rev
Log:
fixed issue with already assigned port numbers
Modified:
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
Modified:
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java?rev=1398504&r1=1398503&r2=1398504&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/BaseJettyTest.java
Mon Oct 15 20:47:00 2012
@@ -17,6 +17,7 @@
package org.apache.camel.component.jetty;
import java.util.Properties;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
@@ -25,12 +26,12 @@ import org.apache.camel.test.AvailablePo
import org.apache.camel.test.junit4.CamelTestSupport;
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 {
// start from somewhere in the 23xxx range
@@ -56,8 +57,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.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java?rev=1398504&r1=1398503&r2=1398504&view=diff
==============================================================================
---
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
(original)
+++
camel/branches/camel-2.10.x/components/camel-jetty/src/test/java/org/apache/camel/component/jetty/JettyEnableJmxTest.java
Mon Oct 15 20:47: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";