From 6d190ea7c2bc2b5c45b0407280722a8eefbeb045 Mon Sep 17 00:00:00 2001
From: Doug Schaefer <doug.schaefer@windriver.com>
Date: Thu, 7 Sep 2006 14:50:24 +0000
Subject: [PATCH] Bug 156436 - fixed error pattern to use full path if it can't
 find a resource name uniquely.

---
 .../eclipse/cdt/internal/errorparsers/ErrorPattern.java    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java
index 4bc89fad03e..802173cd7e2 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/errorparsers/ErrorPattern.java
@@ -125,13 +125,10 @@ public class ErrorPattern {
 		IFile file = null;
 		if (fileName != null) {
 			file = eoParser.findFileName(fileName);
-			if (file != null) {
-				if (eoParser.isConflictingName(fileName)) {
-					file = null;
-				}
-			} else {
+			if (file == null || eoParser.isConflictingName(fileName)) {
 				file = eoParser.findFilePath(fileName);
 			}
+			
 			if (file == null) {
 				desc = fileName + " " + desc; //$NON-NLS-1$
 			}