From 861c9a0a29eda03bb2e08d4c797781c04ad4001c Mon Sep 17 00:00:00 2001
From: Sergey Prigogin <eclipse.sprigogin@gmail.com>
Date: Tue, 22 Apr 2014 16:12:35 -0700
Subject: [PATCH] Fixed an NPE.

---
 .../parser/org/eclipse/cdt/internal/core/pdom/PDOM.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
index 513598bc25f..f89ab42a6c0 100644
--- a/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
+++ b/core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/pdom/PDOM.java
@@ -1021,7 +1021,7 @@ public class PDOM extends PlatformObject implements IPDOM {
 			long start= sDEBUG_LOCKS ? System.currentTimeMillis() : 0;
 			while (lockCount > giveupReadLocks || waitingReaders > 0) {
 				mutex.wait(CANCELLATION_CHECK_INTERVAL);
-				if (monitor.isCanceled()) {
+				if (monitor != null && monitor.isCanceled()) {
 					throw new OperationCanceledException();
 				}
 				if (sDEBUG_LOCKS) {