From 53e62ebcc571214d2a211754092432b4c6bb1939 Mon Sep 17 00:00:00 2001
From: Chris Recoskie <recoskie@ca.ibm.com>
Date: Mon, 22 Aug 2011 15:29:57 -0400
Subject: [PATCH] Bug 355399 - NPE in
 ScannerInfoConsoleParserUtility.translateRelativePaths() for remote projects

---
 .../core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java
index 2cd11728e96..1ff5e0f1e53 100644
--- a/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java
+++ b/build/org.eclipse.cdt.make.core/src/org/eclipse/cdt/make/internal/core/scannerconfig/gnu/ScannerInfoConsoleParserUtility.java
@@ -238,7 +238,7 @@ public class ScannerInfoConsoleParserUtility extends AbstractGCCBOPConsoleParser
 							tPath = tPath.removeFirstSegments(1);
 						}
 						// get the file path from the file
-						filePath = file.getLocation();
+						filePath = new Path(EFSExtensionManager.getDefault().getPathFromURI(file.getLocationURI()));
 						IPath lastFileSegment = filePath.removeFirstSegments(filePath.segmentCount() - tPath.segmentCount());
 						if (lastFileSegment.matchingFirstSegments(tPath) == tPath.segmentCount()) {
 							cwd = filePath.removeLastSegments(tPath.segmentCount());