[Cogkit-svn] SF.net SVN: cogkit: [1971] trunk/current/src/cog/modules/provider-coaster/ src/org/globus/cog/abstraction/impl/execution/coaster

[<ha...@us...>]

Revision: 1971
          http://cogkit.svn.sourceforge.net/cogkit/?rev=1971&view=rev
Author:   hategan
Date:     2008-04-22 11:13:19 -0700 (Tue, 22 Apr 2008)

Log Message:
-----------
fixes for port ranges and ip addresses

Modified Paths:
--------------
    trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
    trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/BootstrapService.java
    trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/PortManager.java

Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java	2008-04-22 16:03:56 UTC (rev 1970)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/Bootstrap.java	2008-04-22 18:13:19 UTC (rev 1971)
@@ -216,7 +216,7 @@
     
     private void addProperty(List args, String name) {
         String value = System.getProperty(name);
-        if (value != null) {
+        if (value != null && !value.equals("")) {
             args.add("-D" + name + "=" + value);
         }
     }

Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/BootstrapService.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/BootstrapService.java	2008-04-22 16:03:56 UTC (rev 1970)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/BootstrapService.java	2008-04-22 18:13:19 UTC (rev 1971)
@@ -161,8 +161,13 @@
         }
         else {
             ServerSocket socket = channel.socket();
-            return "http://" + CoGProperties.getDefault().getIPAddress()
+            if (CoGProperties.getDefault().getIPAddress() != null) {
+                return "http://" + CoGProperties.getDefault().getIPAddress()
                     + ":" + socket.getLocalPort();
+            }
+            else {
+            	return "http://localhost:" + socket.getLocalPort();
+            }
         }
     }
 

Modified: trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/PortManager.java
===================================================================
--- trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/PortManager.java	2008-04-22 16:03:56 UTC (rev 1970)
+++ trunk/current/src/cog/modules/provider-coaster/src/org/globus/cog/abstraction/impl/execution/coaster/PortManager.java	2008-04-22 18:13:19 UTC (rev 1971)
@@ -18,26 +18,26 @@
 
 public class PortManager {
     private static PortManager portManager;
-    
+
     public synchronized static PortManager getDefault() {
         if (portManager == null) {
             portManager = new PortManager();
         }
         return portManager;
     }
-    
+
     private PortRange portRange;
-    
+
     protected PortManager() {
         portRange = PortRange.getTcpInstance();
     }
-    
+
     public ServerSocketChannel openServerSocketChannel() throws IOException {
         ServerSocketChannel s = ServerSocketChannel.open();
         bind(s.socket());
         return s;
     }
-    
+
     public void close(ServerSocketChannel s) throws IOException {
         s.close();
         portRange.free(s.socket().getLocalPort());
@@ -45,16 +45,23 @@
 
     private void bind(ServerSocket socket) throws IOException {
         int crt = 0;
-        while(true) {
-            crt = portRange.getFreePort(crt);
-            try {
-                socket.bind(new InetSocketAddress(crt));
-                portRange.setUsed(crt);
-                return;
+        if (portRange.isEnabled()) {
+            while (true) {
+                crt = portRange.getFreePort(crt);
+
+                try {
+                    socket.bind(new InetSocketAddress(crt));
+
+                    portRange.setUsed(crt);
+                    return;
+                }
+                catch (IOException e) {
+                    crt++;
+                }
             }
-            catch (IOException e) {
-                crt++;
-            }
         }
+        else {
+            socket.bind(null);
+        }
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.