mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-10 09:45:39 +02:00
Code Issues Wiki Activity

Fix for [Bug 197715] getConfigurationForDescription fails if it's a cache

Browse source
This commit is contained in:
Mikhail Sennikovsky 2007-07-25 15:04:20 +00:00
parent 79c143bd48
commit 4cb1ac4e55
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/org.eclipse.cdt.core/model/org/eclipse/cdt/internal/core/settings/model/CConfigurationDescription.java
View file

@ -370,7 +370,11 @@ public class CConfigurationDescription extends CDataProxyContainer implements IC
} }
public CConfigurationData getConfigurationData() { public CConfigurationData getConfigurationData() {
return getConfigurationData(true); CConfigurationData data = getConfigurationData(true);
if(data instanceof CConfigurationDescriptionCache){
data = ((CConfigurationDescriptionCache)data).getConfigurationData();
}
return data;
} }
public void setConfigurationData(String buildSystemId, CConfigurationData data) throws WriteAccessException { public void setConfigurationData(String buildSystemId, CConfigurationData data) throws WriteAccessException {

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

@ -115,7 +115,7 @@ public abstract class CDataProxy implements ICSettingObject {
setRescan(true); setRescan(true);
} }
protected void checkUpdate(boolean write){ final protected void checkUpdate(boolean write){
if((write && !containsWritableData()) if((write && !containsWritableData())
|| isRescan()) || isRescan())
fParent.updateChild(this, write); fParent.updateChild(this, write);