1 files changed, 6 insertions, 3 deletions
diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java
index 3455672fa4dc..0a94548338d4 100644
--- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java
+++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/NodeDescriptorFactoryImpl.java
@@ -93,6 +93,10 @@ public class NodeDescriptorFactoryImpl implements NodeDescriptorFactory {
   }
 
   public void deriveHistoryTree(DescriptorTree tree, final StackFrameContext context) {
+    deriveHistoryTree(tree, context.getFrameProxy());
+  }
+
+  public void deriveHistoryTree(DescriptorTree tree, final StackFrameProxy frameProxy) {
 
     final MarkedDescriptorTree descriptorTree = new MarkedDescriptorTree();
     final MarkedDescriptorTree displayDescriptorTree = new MarkedDescriptorTree();
@@ -109,13 +113,12 @@ public class NodeDescriptorFactoryImpl implements NodeDescriptorFactory {
     myDescriptorSearcher = new DescriptorTreeSearcher(descriptorTree);
     myDisplayDescriptorSearcher = new DisplayDescriptorTreeSearcher(displayDescriptorTree);
 
-    myCurrentHistoryTree = createDescriptorTree(context, tree);
+    myCurrentHistoryTree = createDescriptorTree(frameProxy, tree);
   }
 
-  private static DescriptorTree createDescriptorTree(final StackFrameContext context, final DescriptorTree fromTree) {
+  private static DescriptorTree createDescriptorTree(final StackFrameProxy frameProxy, final DescriptorTree fromTree) {
     int frameCount = -1;
     int frameIndex = -1;
-    final StackFrameProxy frameProxy = context.getFrameProxy();
     if (frameProxy != null) {
       try {
         final ThreadReferenceProxy threadReferenceProxy = frameProxy.threadProxy();