nice

David Cooke · David Cooke · commit 982a9ea4c3eb · 2021-08-13T15:27:32.000+01:00
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ allprojects {
     apply plugin: 'jacoco'
 
     group = 'uk.co.ractf'
-    version = '0.0.68'
+    version = '0.0.69'
 
     repositories {
         maven { url "https://repo1.maven.org/maven2/" }
diff --git a/polaris-application/src/main/java/uk/co/ractf/polaris/controller/PortAllocator.java b/polaris-application/src/main/java/uk/co/ractf/polaris/controller/PortAllocator.java
@@ -61,11 +61,13 @@ public Map<PortMapping, PortBinding> allocate(final List<PortMapping> portMappin
                 }
             }
 
+            lastTcpPort++;
+            lastUdpPort++;
             if (portAllocations.getTcp().contains(lastTcpPort)) {
-                lastTcpPort++;
+                lastTcpPort = generatePort(min, max, portAllocations.getTcp());
             }
             if (portAllocations.getUdp().contains(lastUdpPort)) {
-                lastUdpPort++;
+                lastUdpPort = portAllocations.getUdp().contains(lastTcpPort) ? generatePort(min, max, portAllocations.getUdp()) : lastTcpPort;
             }
         }
         return portBindings;

Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,13 @@ public Map<PortMapping, PortBinding> allocate(final List<PortMapping> portMappin`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
	`64`	`+ lastTcpPort++;`
	`65`	`+ lastUdpPort++;`
`64`	`66`	`if (portAllocations.getTcp().contains(lastTcpPort)) {`
`65`		`- lastTcpPort++;`
	`67`	`+ lastTcpPort = generatePort(min, max, portAllocations.getTcp());`
`66`	`68`	`}`
`67`	`69`	`if (portAllocations.getUdp().contains(lastUdpPort)) {`
`68`		`- lastUdpPort++;`
	`70`	`+ lastUdpPort = portAllocations.getUdp().contains(lastTcpPort) ? generatePort(min, max, portAllocations.getUdp()) : lastTcpPort;`
`69`	`71`	`}`
`70`	`72`	`}`
`71`	`73`	`return portBindings;`