You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2011/09/27 16:34:03 UTC

svn commit: r1176400 - /openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java

Author: andygumbrecht
Date: Tue Sep 27 14:34:03 2011
New Revision: 1176400

URL: http://svn.apache.org/viewvc?rev=1176400&view=rev
Log:
Close streams in an orderly fashion, rather than Socket.close.

Modified:
    openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java

Modified: openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java?rev=1176400&r1=1176399&r2=1176400&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java (original)
+++ openejb/trunk/openejb3/server/openejb-client/src/main/java/org/apache/openejb/client/Client.java Tue Sep 27 14:34:03 2011
@@ -106,13 +106,15 @@ public class Client {
             throw new RemoteException("Unable to connect", e);
         }
 
+        OutputStream out = null;
+        InputStream in = null;
+
         try {
 
 
             /*----------------------------------*/
             /* Get output streams */
             /*----------------------------------*/
-            OutputStream out;
             try {
 
                 out = conn.getOuputStream();
@@ -200,7 +202,7 @@ public class Client {
             /*----------------------------------*/
             /* Get input streams               */
             /*----------------------------------*/
-            InputStream in;
+
             try {
 
                 in = conn.getInputStream();
@@ -310,13 +312,31 @@ public class Client {
             throw new RemoteException("Error while communicating with server: ", error);
 
         } finally {
-            try {
-                if (conn != null) {
+
+            if(null != out){
+                try {
+                    out.close();
+                } catch (Throwable e) {
+                    //Ignore
+                }
+            }
+
+            if(null != in){
+                try {
+                    in.close();
+                } catch (Throwable e) {
+                    //Ignore
+                }
+            }
+
+            if (null != conn) {
+                try {
                     conn.close();
+                } catch (Throwable t) {
+                    logger.log(Level.WARNING, "Error closing connection with server: " + t.getMessage(), t);
                 }
-            } catch (Throwable t) {
-                logger.log(Level.WARNING, "Error closing connection with server: " + t.getMessage(), t);
             }
+
         }
         return res;
     }
@@ -347,6 +367,6 @@ public class Client {
     }
 
     private boolean getRetry() {
-        return retry = new Boolean(System.getProperty("openejb.client.requestretry", retry + ""));
+        return retry = Boolean.valueOf(System.getProperty("openejb.client.requestretry", retry + ""));
     }
 }