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

[241288] - temporary fix - trying to avoid dead-lock on import

Browse source
This commit is contained in:
Alena Laskavaia 2008-07-17 18:23:23 +00:00
parent 1b041f56b4
commit 77b67de31f
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptorManager.java
View file

@ -122,7 +122,7 @@ public class CConfigBasedDescriptorManager implements ICDescriptorManager {
if (dr.getProjectOwner().getID().equals(NULLCOwner.getOwnerID())) {
// non owned descriptors are simply configure to the new owner no questions ask!
dr = updateDescriptor(project, dr, id);
dr.apply(true);
} else if (!dr.getProjectOwner().getID().equals(id)) {
IStatus status = new Status(IStatus.ERROR, CCorePlugin.PLUGIN_ID, CCorePlugin.STATUS_CDTPROJECT_EXISTS,
CCorePlugin.getResourceString("CDescriptorManager.exception.alreadyConfigured"), //$NON-NLS-1$
@ -135,7 +135,7 @@ public class CConfigBasedDescriptorManager implements ICDescriptorManager {
// try {
dr = findDescriptor(project, true);
dr = updateDescriptor(project, dr, id);
dr.apply(true);
// } catch (CoreException e) { // if .cdtproject already exists we'll use that
// IStatus status = e.getStatus();
// if (status.getCode() == CCorePlugin.STATUS_CDTPROJECT_EXISTS) {
@ -145,7 +145,8 @@ public class CConfigBasedDescriptorManager implements ICDescriptorManager {
// }
}
}
dr.apply(true);
if(dr.isOperationStarted())
dr.setOpEvent(new CDescriptorEvent(dr, CDescriptorEvent.CDTPROJECT_ADDED, 0));
}
@ -185,9 +186,9 @@ public class CConfigBasedDescriptorManager implements ICDescriptorManager {
synchronized(CProjectDescriptionManager.getInstance()){
dr = updateDescriptor(project, dr, id);
dr.apply(true);
}
dr.apply(true);
if(dr.isOperationStarted())
dr.setOpEvent(new CDescriptorEvent(dr, CDescriptorEvent.CDTPROJECT_CHANGED, CDescriptorEvent.OWNER_CHANGED));
}