Merge remote-tracking branch 'origin/master'

java/debugger/impl/src/com/intellij/debugger/engine/DebugProcessImpl.java

@@ -865,6 +865,7 @@ public abstract class DebugProcessImpl extends UserDataHolderBase implements Deb
   public void dispose() {
     NodeRendererSettings.getInstance().removeListener(mySettingsListener);
     Disposer.dispose(myDisposable);
+    myRequestManager.setFilterThread(null);
   }
 
   @Override

java/debugger/impl/src/com/intellij/debugger/engine/JavaDebugProcess.java

@@ -16,6 +16,7 @@
 package com.intellij.debugger.engine;
 
 import com.intellij.debugger.DebuggerBundle;
+import com.intellij.debugger.DebuggerInvocationUtil;
 import com.intellij.debugger.actions.DebuggerActions;
 import com.intellij.debugger.engine.evaluation.EvaluationContext;
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
@@ -210,7 +211,13 @@ public class JavaDebugProcess extends XDebugProcess {
 
   @Override
   public void stop() {
-    myJavaSession.getProcess().dispose();
+    DebuggerInvocationUtil.invokeLater(myJavaSession.getProject(), new Runnable() {
+      @Override
+      public void run() {
+        myJavaSession.dispose();
+      }
+    });
+    myNodeManager.dispose();
   }
 
   @Override

java/debugger/impl/src/com/intellij/debugger/engine/JavaStackFrame.java

@@ -366,6 +366,6 @@ public class JavaStackFrame extends XStackFrame {
   @Nullable
   @Override
   public Object getEqualityObject() {
-    return getStackFrameProxy();
+    return getStackFrameProxy().hashCode();
   }
 }