1 files changed, 3 insertions, 1 deletions
diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java
index 8d89714e7..871c84a2c 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ChildrenCountUpdate.java
@@ -232,7 +232,9 @@ class ChildrenCountUpdate extends ViewerUpdateMonitor implements IChildrenCountU
     protected boolean doEquals(ViewerUpdateMonitor update) {
         return 
             update instanceof ChildrenCountUpdate && 
-            getViewerInput().equals(update.getViewerInput()) && 
+            // Bug 380288 - workaround a race condition where update is initialized with null input.
+            ((getViewerInput() == null && update.getViewerInput() == null) || 
+             (getViewerInput() != null && getViewerInput().equals(update.getViewerInput()))) && 
             getElementPath().equals(getElementPath());
     }