[Swift-commit] Cog update

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3371 | hategan | 2012-04-10 18:57:05 -0500 (Tue, 10 Apr 2012) | 1 line

fixed npe for standalone coaster service
------------------------------------------------------------------------
Index: modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterService.java
===================================================================
--- modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterService.java	(revision 3370)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/CoasterService.java	(working copy)
@@ -99,10 +99,12 @@
 
     protected void initializeLocalService() throws IOException {
         localService = new LocalTCPService(newLocalRequestManager());
+        localService.start();
     }
 
     protected void initializeLocalService(int port) throws IOException {
         localService = new LocalTCPService(newLocalRequestManager(), port);
+        localService.start();
     }
 
 
@@ -140,7 +142,6 @@
             if (localService == null) {
                 throw new IllegalStateException("Local service not initialized");
             }
-            localService.start();
             jobQueue = new JobQueue(localService);
             jobQueue.start();
             localService.setRegistrationManager(jobQueue);
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 3370)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/LocalTCPService.java	(working copy)
@@ -14,7 +14,6 @@
 import java.net.Socket;
 import java.net.SocketException;
 import java.net.URI;
-import java.net.URISyntaxException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 import java.util.Map;
@@ -44,8 +43,6 @@
     private RequestManager requestManager;
     private ServiceContext context = new ServiceContext(this);
     
-    private final URI contact;
-    
     private Thread serverThread;
 
     public LocalTCPService(RequestManager rm) throws IOException {
@@ -56,14 +53,6 @@
         setRequestManager(rm);
         buffMan = new TCPBufferManager();
         this.port = port;
-        URI lh = null;
-        try {
-            lh = new URI("localhost:" + port);
-        }
-        catch (URISyntaxException e) {
-            logger.error("Internal error", e);
-        }
-        this.contact = lh;
     }
 
     public String registrationReceived(String blockid, String url,