diff options
author | Alain Magloire | 2004-05-05 00:08:57 +0000 |
---|---|---|
committer | Alain Magloire | 2004-05-05 00:08:57 +0000 |
commit | a9e573a74c422ea7fa47c0087b7c9189bb968879 (patch) | |
tree | 93a11678f6fc08daa5f2b2c8e5bcf62e0e7b3553 | |
parent | 4e2d61d2981a623d20dd6ea141f2618165e07cef (diff) | |
download | org.eclipse.cdt-a9e573a74c422ea7fa47c0087b7c9189bb968879.tar.gz org.eclipse.cdt-a9e573a74c422ea7fa47c0087b7c9189bb968879.tar.xz org.eclipse.cdt-a9e573a74c422ea7fa47c0087b7c9189bb968879.zip |
Race condition causing deadlocks fix.
3 files changed, 9 insertions, 3 deletions
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; |