Add checks for existence of entries in tree before scrolling.

Change-Id: I9abe5b5c616c5f11ed6f318eff2f44f7104c7f73

2 files changed, 6 insertions, 2 deletions

diff --git a/android/src/com/android/tools/idea/editors/hprof/views/ClassesTreeView.java b/android/src/com/android/tools/idea/editors/hprof/views/ClassesTreeView.java
index 8063610c121..63ee0a0005c 100644
--- a/android/src/com/android/tools/idea/editors/hprof/views/ClassesTreeView.java
+++ b/android/src/com/android/tools/idea/editors/hprof/views/ClassesTreeView.java
@@ -488,7 +488,9 @@ public class ClassesTreeView implements DataProvider {
     }
     else {
       selectionModel.setClassObj(null);
-      myTree.scrollRowToVisible(0);
+      if (myTree.getRowCount() > 0) {
+        myTree.scrollRowToVisible(0);
+      }
     }
   }
 
diff --git a/android/src/com/android/tools/idea/editors/hprof/views/InstancesTreeView.java b/android/src/com/android/tools/idea/editors/hprof/views/InstancesTreeView.java
index 9c7e78fed6e..af8203c8a4c 100644
--- a/android/src/com/android/tools/idea/editors/hprof/views/InstancesTreeView.java
+++ b/android/src/com/android/tools/idea/editors/hprof/views/InstancesTreeView.java
@@ -200,7 +200,9 @@ public class InstancesTreeView implements DataProvider {
 
         myDebuggerTree.getMutableModel().setRoot(newRoot);
         myDebuggerTree.treeChanged();
-        myDebuggerTree.scrollRowToVisible(0);
+        if (myDebuggerTree.getRowCount() > 0) {
+          myDebuggerTree.scrollRowToVisible(0);
+        }
 
         if (singleChild != null) {
           myDebuggerTree.setSelectionInterval(0 , 0);