db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r824850 - in /db/derby/code/branches/10.5: ./ java/drda/org/apache/derby/impl/drda/ClientThread.java
Date Tue, 13 Oct 2009 17:23:58 GMT
Author: mamta
Date: Tue Oct 13 17:23:58 2009
New Revision: 824850

URL: http://svn.apache.org/viewvc?rev=824850&view=rev
Log:
DERBY-4326

Merged the changes into 10.5 codeline


Modified:
    db/derby/code/branches/10.5/   (props changed)
    db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/ClientThread.java

Propchange: db/derby/code/branches/10.5/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct 13 17:23:58 2009
@@ -1 +1 @@
-/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006
+/db/derby/code/trunk:769596,769602,769606,769962,772090,772337,772449,772534,774281,777105,779681,782991,785131,785139,785163,785570,785662,788369,788670,788674,788968,789264,790218,792434,793089,793588,794106,794303,794955,795166,796020,796027,796316,796372,797147,798347,798742,800523,803548,803948,805696,808494,808850,809643,810860,812669,816531,816536,819006,823659

Modified: db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=824850&r1=824849&r2=824850&view=diff
==============================================================================
--- db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/branches/10.5/java/drda/org/apache/derby/impl/drda/ClientThread.java Tue
Oct 13 17:23:58 2009
@@ -92,13 +92,19 @@
                     } // end inner try/catch block
                     
                 } catch (InterruptedException ie) {
-                    // This is a shutdown and we'll just exit the
-                    // thread. NOTE: This is according to the logic
-                    // before this rewrite. I am not convinced that it
-                    // is allways the case, but will not alter the
-                    // behaviour since it is not within the scope of
-                    // this change (DERBY-2108).
-                    return;
+                    if (parent.getShutdown()) {
+                        // This is a shutdown and we'll just exit the
+                        // thread. NOTE: This is according to the logic
+                        // before this rewrite. I am not convinced that it
+                        // is allways the case, but will not alter the
+                        // behaviour since it is not within the scope of
+                        // this change (DERBY-2108).
+                    	clientSocket.close();
+            	        return;
+                    }
+                    parent.consoleExceptionPrintTrace(ie);
+                    if (clientSocket != null)
+                        clientSocket.close();
 
                 } catch (javax.net.ssl.SSLException ssle) {
                     // SSLException is a subclass of
@@ -115,17 +121,17 @@
                     return; // Exit the thread
                     
                 } catch (IOException ioe) {
+                    if (clientSocket != null)
+                        clientSocket.close();
                     // IOException causes this thread to stop.  No
                     // console error message if this was caused by a
                     // shutdown
                     synchronized (parent.getShutdownSync()) {
-                        if (!parent.getShutdown()) {
-                            parent.consoleExceptionPrintTrace(ioe);
-                            if (clientSocket != null)
-                                clientSocket.close();
-                        }
+                        if (parent.getShutdown()) {
+                            return; // Exit the thread
+                        } 
                     }
-                    return; // Exit the thread
+                    parent.consoleExceptionPrintTrace(ioe);
                 }
             } catch (Exception e) {
                 // Catch and log all other exceptions



Mime
View raw message