Bug 372619 - 10 test failures in official build

1 files changed, 7 insertions, 6 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java
index a093c2beb..cdfecec33 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/InternalVirtualTreeModelViewer.java
@@ -560,19 +560,20 @@ public class InternalVirtualTreeModelViewer extends Viewer
     }
     
     public VirtualItem findItem(TreePath path) {
-        VirtualItem item = fTree;
         if (path.getSegmentCount() == 0) {
             return fTree;
         }
 
         List itemsList = (List)fItemsMap.get(path.getLastSegment());
-        for (int i = 0; i < itemsList.size(); i++) {
-        	if ( path.equals(getTreePathFromItem((VirtualItem)itemsList.get(i))) ) {
-        		return (VirtualItem)itemsList.get(i);
-        	}
+        if (itemsList != null) {
+	        for (int i = 0; i < itemsList.size(); i++) {
+	        	if ( path.equals(getTreePathFromItem((VirtualItem)itemsList.get(i))) ) {
+	        		return (VirtualItem)itemsList.get(i);
+	        	}
+	        }
         }
         
-        return item;
+        return null;
     }
 
     static private final VirtualItem[] EMPTY_ITEMS_ARRAY = new VirtualItem[0];