Fix general exception for native methods. (microsoft#148)

yaohaizh · web-flow · commit bb142e16959e · 2018-01-29T11:26:35.000+08:00
diff --git a/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/StackFrameUtility.java b/com.microsoft.java.debug.core/src/main/java/com/microsoft/java/debug/core/StackFrameUtility.java
@@ -14,6 +14,7 @@
 import com.sun.jdi.AbsentInformationException;
 import com.sun.jdi.IncompatibleThreadStateException;
 import com.sun.jdi.InvalidStackFrameException;
+import com.sun.jdi.NativeMethodException;
 import com.sun.jdi.ReferenceType;
 import com.sun.jdi.StackFrame;
 
@@ -32,8 +33,14 @@ public static boolean isNative(StackFrame frame) {
     public static void pop(StackFrame frame) throws DebugException {
         try {
             frame.thread().popFrames(frame);
-        } catch (IncompatibleThreadStateException | InvalidStackFrameException e) {
-            throw new DebugException(e.getMessage(), e);
+        } catch (IncompatibleThreadStateException e) {
+            throw new DebugException(String.format("%s occurred popping stack frame.", e.getMessage()), e);
+        } catch (InvalidStackFrameException e) {
+            throw new DebugException("Cannot pop up the top stack farme.", e);
+        } catch (NativeMethodException e) {
+            throw new DebugException("Cannot pop up the stack frame because it is not valid for a native method.", e);
+        } catch (RuntimeException e) {
+            throw new DebugException(String.format("Runtime exception happened: %s", e.getMessage()), e);
         }
     }
 
