Update of /cvsroot/monetdb/pathfinder/runtime
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv20186

Modified Files:
      Tag: XQuery_0-18
        xrpc_client.mx xrpc_server.mx 
Log Message:
- don't close the same socket twice
- directly flush the error stream.



Index: xrpc_client.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_client.mx,v
retrieving revision 1.38
retrieving revision 1.38.2.1
diff -u -d -r1.38 -r1.38.2.1
--- xrpc_client.mx      2 Jun 2007 21:20:08 -0000       1.38
+++ xrpc_client.mx      20 Aug 2007 11:00:41 -0000      1.38.2.1
@@ -1234,8 +1234,9 @@
 
     shredBAT = response2bat(sock, dst, port, b, *updCall,
                                 &time_xrpcClntDeSeria);
+    clean_up(-1, out, bs, b, argcnt, iterc);
+
     if(!shredBAT) {
-        clean_up(sock, out, bs, b, argcnt, iterc);
         return GDK_FAIL;
     }
 
@@ -1251,7 +1252,6 @@
                 time_xrpcClntDeSeria);
     }
 
-    clean_up(-1, out, bs, b, argcnt, iterc);
     *res = shredBAT;
     return GDK_SUCCEED;
 }

Index: xrpc_server.mx
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/runtime/xrpc_server.mx,v
retrieving revision 1.48.2.1
retrieving revision 1.48.2.2
diff -u -d -r1.48.2.1 -r1.48.2.2
--- xrpc_server.mx      22 Jun 2007 17:46:46 -0000      1.48.2.1
+++ xrpc_server.mx      20 Aug 2007 11:00:47 -0000      1.48.2.2
@@ -283,6 +283,7 @@
             "</env:Reason>"
             "</env:Fault></env:Body></env:Envelope>\n",
             SOAP_NS, soap_err, err_reason);
+    stream_flush(out);
 }
 
 /**


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins

Reply via email to