[r301] Bug 70993 - incompatible thread state from drop to frame actionr301_v20040803

1 files changed, 5 insertions, 0 deletions

diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java
index d87df5830..540486bf3 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIStackFrame.java
@@ -36,6 +36,7 @@ import org.eclipse.jdt.internal.debug.core.JDIDebugPlugin;
 
 import com.sun.jdi.AbsentInformationException;
 import com.sun.jdi.Field;
+import com.sun.jdi.IncompatibleThreadStateException;
 import com.sun.jdi.LocalVariable;
 import com.sun.jdi.Method;
 import com.sun.jdi.NativeMethodException;
@@ -566,6 +567,10 @@ public class JDIStackFrame extends JDIDebugElement implements IJavaStackFrame {
 			}
 			return false;
 		} catch (DebugException e) {
+			if (e.getStatus().getException() instanceof IncompatibleThreadStateException) {
+				// if the thread has since resumed, drop is not supported
+				return false;
+			}
 			logError(e);
 		} catch (UnsupportedOperationException e) {
 			// drop to frame not supported - this is an expected