bug 18797
diff --git a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
index 9f71d16..946fd97 100644
--- a/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
+++ b/org.eclipse.jdt.debug/model/org/eclipse/jdt/internal/debug/core/model/JDIThread.java
@@ -789,6 +789,7 @@
  	 * @see #newInstance(ClassType, Method, List)

 	 */

 	protected void invokeComplete(int restoreTimeout) {

+		abortStep();

 		setRunning(false);

 		setInvokingMethod(false);

 		setRequestTimeout(restoreTimeout);