mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-25 18:05:33 +02:00
Code Issues Wiki Activity

Race condition causing deadlocks fix.

Browse source
This commit is contained in:
Alain Magloire 2004-05-05 00:08:57 +00:00
parent 4e2d61d298
commit a9e573a74c
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/ChangeLog
View file

@ -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 2004-04-29 Alain Magloire
Changes to working copy, to be wrap in runnable Plaform Changes to working copy, to be wrap in runnable Plaform

2
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/CModelManager.java
View file

@ -744,7 +744,7 @@ public class CModelManager implements IResourceChangeListener, ICDescriptorListe
* Fire C Model deltas, flushing them after the fact. * Fire C Model deltas, flushing them after the fact.
* If the firing mode has been turned off, this has no effect. * 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) { if (fFire) {
ICElementDelta deltaToNotify; ICElementDelta deltaToNotify;
if (customDeltas == null) { if (customDeltas == null) {

4
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/model/LibraryEntry.java
View file

@ -37,7 +37,7 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry {
public LibraryEntry(IPath resourcePath, IPath basePath, IPath baseRef, IPath libraryPath, IPath sourceAttachmentPath, public LibraryEntry(IPath resourcePath, IPath basePath, IPath baseRef, IPath libraryPath, IPath sourceAttachmentPath,
IPath sourceAttachmentRootPath, IPath sourceAttachmentPrefixMapping, boolean isExported) { IPath sourceAttachmentRootPath, IPath sourceAttachmentPrefixMapping, boolean isExported) {
super(ILibraryEntry.CDT_LIBRARY, basePath, baseRef, resourcePath, APathEntry.NO_EXCLUSION_PATTERNS, 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.sourceAttachmentPath = sourceAttachmentPath;
this.sourceAttachmentRootPath = sourceAttachmentRootPath; this.sourceAttachmentRootPath = sourceAttachmentRootPath;
this.sourceAttachmentPrefixMapping = sourceAttachmentPrefixMapping; this.sourceAttachmentPrefixMapping = sourceAttachmentPrefixMapping;
@ -133,7 +133,7 @@ public class LibraryEntry extends APathEntry implements ILibraryEntry {
} }
public IPath getFullLibraryPath() { public IPath getFullLibraryPath() {
IPath lib = getPath(); IPath lib = getLibraryPath();
IPath p = (!basePath.isEmpty()) ? basePath.append(lib) : lib; IPath p = (!basePath.isEmpty()) ? basePath.append(lib) : lib;
if (p.isAbsolute()) { if (p.isAbsolute()) {
return p; return p;