From fad6971feda9545b5da0328a1f642956c6fc831b Mon Sep 17 00:00:00 2001
From: andxu <andxu@microsoft.com>
Date: Thu, 15 Mar 2018 17:03:44 +0800
Subject: [PATCH 1/2] fix bug
 https://github.com/Microsoft/vscode-java-debug/issues/254

---
 check_style.xml                                                | 3 ---
 .../java/debug/plugin/internal/eval/JdtEvaluationProvider.java | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/check_style.xml b/check_style.xml
index e875c5296..0879dc945 100644
--- a/check_style.xml
+++ b/check_style.xml
@@ -104,9 +104,6 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="120"/>
-        </module>
         <module name="RightCurly">
             <property name="id" value="RightCurlySame"/>
             <property name="tokens"
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
index 76644c5b9..9e86e7934 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
@@ -95,7 +95,7 @@ public CompletableFuture<Value> evaluateForBreakpoint(IBreakpoint breakpoint, Th
         try  {
             ensureDebugTarget(thread.virtualMachine(), thread, 0);
             JDIThread jdiThread = getMockJDIThread(thread);
-            JDIStackFrame stackframe = (JDIStackFrame) jdiThread.getTopStackFrame();
+            JDIStackFrame stackframe = new JDIStackFrame(jdiThread, thread.frame(0), 0);
 
             ASTEvaluationEngine engine = new ASTEvaluationEngine(project, debugTarget);
             ICompiledExpression ie = (ICompiledExpression) breakpointExpressionMap

From ec5abcca704cb97c730ea1d76e230389f5ec42fc Mon Sep 17 00:00:00 2001
From: andxu <andxu@microsoft.com>
Date: Thu, 15 Mar 2018 17:03:44 +0800
Subject: [PATCH 2/2] fix the invalid stack exception during evaluation

---
 check_style.xml                                                | 3 ---
 .../java/debug/plugin/internal/eval/JdtEvaluationProvider.java | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/check_style.xml b/check_style.xml
index e875c5296..0879dc945 100644
--- a/check_style.xml
+++ b/check_style.xml
@@ -104,9 +104,6 @@
             <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/>
         </module>
         <module name="NeedBraces"/>
-        <module name="LeftCurly">
-            <property name="maxLineLength" value="120"/>
-        </module>
         <module name="RightCurly">
             <property name="id" value="RightCurlySame"/>
             <property name="tokens"
diff --git a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
index 76644c5b9..9e86e7934 100644
--- a/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
+++ b/com.microsoft.java.debug.plugin/src/main/java/com/microsoft/java/debug/plugin/internal/eval/JdtEvaluationProvider.java
@@ -95,7 +95,7 @@ public CompletableFuture<Value> evaluateForBreakpoint(IBreakpoint breakpoint, Th
         try  {
             ensureDebugTarget(thread.virtualMachine(), thread, 0);
             JDIThread jdiThread = getMockJDIThread(thread);
-            JDIStackFrame stackframe = (JDIStackFrame) jdiThread.getTopStackFrame();
+            JDIStackFrame stackframe = new JDIStackFrame(jdiThread, thread.frame(0), 0);
 
             ASTEvaluationEngine engine = new ASTEvaluationEngine(project, debugTarget);
             ICompiledExpression ie = (ICompiledExpression) breakpointExpressionMap