From 50847671c9d92efb6334f6ca03fd44787d1b83f3 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Tue, 9 Mar 2010 15:27:23 +0000 Subject: [PATCH] bug 294106 #comment 92: prevent NPE patch from Mario Pierro --- .../cdt/internal/ui/buildconsole/BuildConsolePartition.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java index 051cc58fb29..07a92d25bde 100644 --- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java +++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsolePartition.java @@ -84,7 +84,7 @@ public class BuildConsolePartition extends TypedRegion { int otherStart = partition.getOffset(); int otherEnd = otherStart + partition.getLength(); boolean overlap = (otherStart >= start && otherStart <= end) || (start >= otherStart && start <= otherEnd); - return overlap && getType().equals(partition.getType()) && getStream().equals(partition.getStream()); + return getStream() != null && overlap && getType().equals(partition.getType()) && getStream().equals(partition.getStream()); } /**