From 1a9c0d8eb71412654e7fe6987013a34abff2b830 Mon Sep 17 00:00:00 2001
From: John Camelon <jcamelon@ca.ibm.com>
Date: Mon, 30 May 2005 18:26:49 +0000
Subject: [PATCH] Patch for Devin Steffler. Bug 97301  	flattenLocationsToFile
 returns null causing NPE in indexer

---
 .../cdt/internal/core/parser/scanner2/BaseScanner.java       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
index 7f6584f2008..7d7af88d089 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/parser/scanner2/BaseScanner.java
@@ -2585,15 +2585,16 @@ abstract class BaseScanner implements IScanner {
                                 buffer, start, len));
                     branchState(BRANCH_IF);
                     
-                    processIf(pos, pos + start + len, true); // fix 86870, process IF before skipping the condition and only process it once
-                    
                     if (expressionEvaluator.evaluate(buffer, start, len,
                             definitions,
                             getLineNumber(bufferPos[bufferStackPos]),
                             getCurrentFilename()) == 0) {
+                    	processIf(pos, bufferPos[bufferStackPos], true);
                         skipOverConditionalCode(true);
                         if (isLimitReached())
                             handleInvalidCompletion();
+                    } else {
+                    	processIf(pos, bufferPos[bufferStackPos], false);
                     }
                     return;
                 case ppElse: