diff --git a/core/org.eclipse.cdt.core/ChangeLog b/core/org.eclipse.cdt.core/ChangeLog
index 7dcd6830748..34aa2c96a19 100644
--- a/core/org.eclipse.cdt.core/ChangeLog
+++ b/core/org.eclipse.cdt.core/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-04 Alain Magloire
+
+	Race condition causing deadlocks fix.
+
+	* model/org/eclipse/cdt/internal/core/model/CModelManager.java
+
 2004-04-29 Alain Magloire
 
 	Changes to working copy, to be wrap in runnable Plaform
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
index 099e5533372..cd77a3c0617 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
@@ -744,7 +744,7 @@ public class CModelManager implements IResourceChangeListener, ICDescriptorListe
 	 * Fire C Model deltas, flushing them after the fact. 
 	 * If the firing mode has been turned off, this has no effect. 
 	 */
-	public synchronized void fire(ICElementDelta customDeltas, int eventType) {
+	public void fire(ICElementDelta customDeltas, int eventType) {
 		if (fFire) {
 			ICElementDelta deltaToNotify;
 			if (customDeltas == null) {
diff --git a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java
index 9cb9264cf41..4f2966b37a6 100644
--- a/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java
+++ b/core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java
@@ -37,7 +37,7 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry {
 	public LibraryEntry(IPath resourcePath, IPath basePath, IPath baseRef, IPath libraryPath, IPath sourceAttachmentPath,
 		IPath sourceAttachmentRootPath, IPath sourceAttachmentPrefixMapping, boolean isExported) {
 		super(ILibraryEntry.CDT_LIBRARY, basePath, baseRef, resourcePath, APathEntry.NO_EXCLUSION_PATTERNS, isExported);
-		this.libraryPath = libraryPath;
+		this.libraryPath = (libraryPath == null) ? EMPTY_PATH : libraryPath;
 		this.sourceAttachmentPath = sourceAttachmentPath;
 		this.sourceAttachmentRootPath = sourceAttachmentRootPath;
 		this.sourceAttachmentPrefixMapping = sourceAttachmentPrefixMapping;
@@ -133,7 +133,7 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry {
 	}
 
 	public IPath getFullLibraryPath() {
-		IPath lib = getPath();
+		IPath lib = getLibraryPath();
 		IPath p = (!basePath.isEmpty()) ? basePath.append(lib) : lib;
 		if (p.isAbsolute()) {
 			return p;