[Swift-commit] Cog update

[swift at ci.uchicago.edu]

------------------------------------------------------------------------
r3368 | hategan | 2012-04-01 22:27:32 -0500 (Sun, 01 Apr 2012) | 1 line

disable SO_LINGER on worker connections
------------------------------------------------------------------------
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 3367)
+++ modules/provider-coaster/src/org/globus/cog/abstraction/coaster/service/LocalTCPService.java	(working copy)
@@ -51,7 +51,7 @@
     }
 
     public String registrationReceived(String blockid, String url, 
-                                       KarajanChannel channel, Map<String, String> options) throws ChannelException {
+           KarajanChannel channel, Map<String, String> options) throws ChannelException {
         if (logger.isInfoEnabled()) {
             logger.info("Received registration: blockid = " +
                         blockid + ", url = " + url);
@@ -81,6 +81,7 @@
     protected void handleConnection(Socket socket) {
         try {
             buffMan.addSocket(socket);
+            socket.setSoLinger(false, 0);
             socket.setTcpNoDelay(true);
         }
         catch (SocketException e) {