1 files changed, 6 insertions, 2 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeManagerImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeManagerImpl.java
index 53e820da02fd..b76022122594 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeManagerImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeManagerImpl.java
@@ -75,11 +75,15 @@ public class NodeManagerImpl extends NodeDescriptorFactoryImpl implements NodeMa
   }
 
   public void setHistoryByContext(final DebuggerContextImpl context) {
+    setHistoryByContext(context.getFrameProxy());
+  }
+
+  public void setHistoryByContext(StackFrameProxyImpl frameProxy) {
     if (myHistoryKey != null) {
       myHistories.put(myHistoryKey, getCurrentHistoryTree());
     }
 
-    final String historyKey = getContextKey(context.getFrameProxy());
+    final String historyKey = getContextKey(frameProxy);
     final DescriptorTree descriptorTree;
     if (historyKey != null) {
       final DescriptorTree historyTree = myHistories.get(historyKey);
@@ -89,7 +93,7 @@ public class NodeManagerImpl extends NodeDescriptorFactoryImpl implements NodeMa
       descriptorTree = new DescriptorTree(true);
     }
 
-    deriveHistoryTree(descriptorTree, context);
+    deriveHistoryTree(descriptorTree, frameProxy);
     myHistoryKey = historyKey;
   }