From 3bdad542ef4b014eafc7657d2b90fc874f2cce44 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Thu, 6 Sep 2012 15:28:08 -0700
Subject: [PATCH] Fixed a race condition in setting up path canonicalization
 strategy.

---
 .../parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
index 13dbeb38268..1ca4bd01953 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOMManager.java
@@ -211,6 +211,9 @@ public class PDOMManager implements IWritableIndexManager, IListener {
 
 	public Job startup() {
 		fInShutDown= false;
+		// Set path canonicalization strategy early on to avoid a race condition.
+		updatePathCanonicalizationStrategy();
+
 		Job postStartupJob= new Job(CCorePlugin.getResourceString("CCorePlugin.startupJob")) { //$NON-NLS-1$
 			@Override
 			protected IStatus run(IProgressMonitor monitor) {