Fix possible regression

GoClipse · Feb 8, 2016 · 843a1a4 · 843a1a4
1 parent dbaaa4d
commit 843a1a4
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/SourceModelManager.java b/plugin_ide.core/src-lang/melnorme/lang/ide/core/engine/SourceModelManager.java
@@ -372,12 +372,15 @@ public static <R> R runUnderDocumentLock(IDocument doc, CallableX<R, RuntimeExce
 		if(doc instanceof ISynchronizable) {
 			ISynchronizable synchronizable = (ISynchronizable) doc;
 
-			synchronized(synchronizable.getLockObject()) {
-				return runnable.call();
+			Object lockObject = synchronizable.getLockObject();
+			if(lockObject != null) {
+				synchronized(lockObject) {
+					return runnable.call();
+				}
 			}
-		} else {
-			return runnable.call();
 		}
+
+		return runnable.call();
 	}
 
 }