[Swift-commit] cog r3523

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3523 | davidkelly999 | 2012-11-27 12:32:11 -0600 (Tue, 27 Nov 2012) | 2 lines

Only use port ranges from GLOBUS_TCP_PORT_RANGE if a port is not explicitly set, eg. from the -localport option of coaster-service

------------------------------------------------------------------------
Index: modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/LocalTCPService.java
===================================================================
--- modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/LocalTCPService.java	(revision 3522)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/LocalTCPService.java	(working copy)
@@ -113,9 +113,9 @@
         
         /* When GLOBUS_TCP_PORT_RANGE is defined, find an acceptable port in that range */
         String globusTCPPortRange = System.getenv("GLOBUS_TCP_PORT_RANGE");
-        String rangeValues[] = {"0", "0"};
+        String rangeValues[] = {String.valueOf(port), String.valueOf(port)};
 
-        if(globusTCPPortRange != null) {
+        if(globusTCPPortRange != null && port == 0) {
             rangeValues = globusTCPPortRange.split(",");
         }