db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1094329 - in /db/derby/code/branches/10.8: ./ java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Date Mon, 18 Apr 2011 07:41:59 GMT
Author: kahatlen
Date: Mon Apr 18 07:41:59 2011
New Revision: 1094329

URL: http://svn.apache.org/viewvc?rev=1094329&view=rev
Log:
DERBY-5192: Setting up network server for management tests hangs intermittently

Merged fix from trunk (revision 1094315).

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

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 18 07:41:59 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315

Modified: db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java?rev=1094329&r1=1094328&r2=1094329&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
(original)
+++ db/derby/code/branches/10.8/java/drda/org/apache/derby/impl/drda/NetworkServerControlImpl.java
Mon Apr 18 07:41:59 2011
@@ -803,7 +803,9 @@ public final class NetworkServerControlI
 			// wait until we are told to shutdown or someone sends an InterruptedException
 	        synchronized(shutdownSync) {
 	            try {
-					shutdownSync.wait();
+                    while (!shutdown) {
+                        shutdownSync.wait();
+                    }
 	            }
 	            catch (InterruptedException e)
 	            {
@@ -1196,8 +1198,8 @@ public final class NetworkServerControlI
 	*/
     void directShutdownInternal() {
 		// DERBY-2109: the direct, unchecked shutdown is made private
-		shutdown = true;
 		synchronized(shutdownSync) {						
+			shutdown = true;
 			// wake up the server thread
 			shutdownSync.notifyAll();
 		}



Mime
View raw message