mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-09 02:36:01 +02:00
Fix for [Bug 199222] An internal error occurred during: "CDT Startup"
This commit is contained in:
parent
573b065d33
commit
30da93f082
1 changed files with 34 additions and 28 deletions
|
@ -187,6 +187,7 @@ public class PropertyManager {
|
||||||
}
|
}
|
||||||
|
|
||||||
protected Properties getPropsFromData(Map data, IBuildObject bo){
|
protected Properties getPropsFromData(Map data, IBuildObject bo){
|
||||||
|
synchronized (data) {
|
||||||
Object oVal = data.get(bo.getId());
|
Object oVal = data.get(bo.getId());
|
||||||
Properties props = null;
|
Properties props = null;
|
||||||
if(oVal instanceof String){
|
if(oVal instanceof String){
|
||||||
|
@ -203,6 +204,7 @@ public class PropertyManager {
|
||||||
|
|
||||||
return props;
|
return props;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
protected void storeData(IConfiguration cfg){
|
protected void storeData(IConfiguration cfg){
|
||||||
|
@ -214,7 +216,9 @@ public class PropertyManager {
|
||||||
|
|
||||||
protected Properties mapToProps(Map map){
|
protected Properties mapToProps(Map map){
|
||||||
Properties props = null;
|
Properties props = null;
|
||||||
if(map != null && map.size() > 0){
|
if(map != null){
|
||||||
|
synchronized(map){
|
||||||
|
if(map.size() > 0){
|
||||||
props = new Properties();
|
props = new Properties();
|
||||||
for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){
|
for(Iterator iter = map.entrySet().iterator(); iter.hasNext();){
|
||||||
Map.Entry entry = (Map.Entry)iter.next();
|
Map.Entry entry = (Map.Entry)iter.next();
|
||||||
|
@ -231,6 +235,8 @@ public class PropertyManager {
|
||||||
props.setProperty(key, value);
|
props.setProperty(key, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return props;
|
return props;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue