mx4j/src/tools/mx4j/tools/adaptor/http HttpAdaptor.java,1.5,1.6

Update of /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/adaptor/http
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16305/src/tools/mx4j/tools/adaptor/http

Modified Files:
	HttpAdaptor.java 
Log Message:
Fix for Bug #931214 HttpAdaptor doesn't stop cleanly

Index: HttpAdaptor.java
===================================================================
RCS file: /cvsroot/mx4j/mx4j/src/tools/mx4j/tools/adaptor/http/HttpAdaptor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** HttpAdaptor.java	5 Apr 2004 19:41:57 -0000	1.5
--- HttpAdaptor.java	13 Jun 2004 21:50:47 -0000	1.6
***************
*** 524,527 ****
--- 524,528 ----
                       if (!alive)
                       {
+                      	client.close();
                          break;
                       }
***************
*** 1024,1029 ****
                    httpOut.flush();
                 }
-                // always close the socket
-                client.close();
              }
              catch (IOException e)
--- 1025,1028 ----
***************
*** 1031,1034 ****
--- 1030,1045 ----
                 log.warn("Exception during request processing", e);
              }
+             finally
+ 			{
+             	try
+ 				{
+                     // always close the socket
+             		client.close();
+ 				}
+             	catch (IOException e)
+ 				{
+             		log.info("Exception during socket close", e);
+ 				}
+ 			}
           }
        }



-------------------------------------------------------
This SF.Net email is sponsored by the new InstallShield X.
From Windows to Linux, servers to mobile, InstallShield X is the
one installation-authoring solution that does it all. Learn more and
evaluate today! http://www.installshield.com/Dev2Dev/0504