[r301] Bug 70993 - incompatible thread state from drop to frame action
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 d87df58..540486b 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 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 @@
}
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
