You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by km...@apache.org on 2008/09/26 15:37:56 UTC
svn commit: r699317 -
/db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/ClientThread.java
Author: kmarsden
Date: Fri Sep 26 06:37:55 2008
New Revision: 699317
URL: http://svn.apache.org/viewvc?rev=699317&view=rev
Log:
DERBY-3869 intermittent hang pinging server on Linux
port from trunk revision 698696
Modified:
db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/ClientThread.java
Modified: db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/ClientThread.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/ClientThread.java?rev=699317&r1=699316&r2=699317&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/ClientThread.java (original)
+++ db/derby/code/branches/10.4/java/drda/org/apache/derby/impl/drda/ClientThread.java Fri Sep 26 06:37:55 2008
@@ -68,7 +68,14 @@
}
}
);
-
+ // Server may have been shut down. If so, close this
+ // client socket and break out of the loop.
+ // DERBY-3869
+ if (parent.getShutdown()) {
+ clientSocket.close();
+ return;
+ }
+
clientSocket.setKeepAlive(parent.getKeepAlive());
// Set time out: Stops DDMReader.fill() from