Bug 311813 - Deadlock in RuntimeProcess.terminated()

1 files changed, 14 insertions, 4 deletions

diff --git a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java
index 6df7e9c10..ad678ed3a 100644
--- a/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java
+++ b/org.eclipse.debug.core/core/org/eclipse/debug/core/model/RuntimeProcess.java
@@ -233,13 +233,23 @@ public class RuntimeProcess extends PlatformObject implements IProcess {
         if (fStreamsProxy instanceof StreamsProxy) {
             ((StreamsProxy)fStreamsProxy).close();
         }
+
+        
+        // Avoid calling IProcess.exitValue() inside a sync section (Bug 311813).
+        int exitValue = -1;
+        boolean running = false;
+        try {
+            exitValue = fProcess.exitValue();
+        } catch (IllegalThreadStateException ie) {
+            running = true;
+        }
+        
 		synchronized (this) {
 			fTerminated= true;
-			try {
-				fExitValue = fProcess.exitValue();
-			} catch (IllegalThreadStateException ie) {
+			if (!running) {
+			    fExitValue = exitValue;
 			}
-			fProcess= null;			
+			fProcess= null;
 		}
 		fireTerminateEvent();
 	}