mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for 209770: CConfigBasedDescriptor.get not thread-safe

Browse source
This commit is contained in:
Anton Leherbauer 2008-01-29 10:41:05 +00:00
parent ad075de767
commit 5a608fee1c
1 changed files with 50 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

89
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/CConfigBasedDescriptor.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2007 Intel Corporation and others. * Copyright (c) 2007, 2008 Intel Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -7,6 +7,7 @@
* *
* Contributors: * Contributors:
* Intel Corporation - Initial API and implementation * Intel Corporation - Initial API and implementation
* Anton Leherbauer (Wind River Systems)
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.internal.core; package org.eclipse.cdt.internal.core;
@ -48,14 +49,14 @@ public class CConfigBasedDescriptor implements ICDescriptor {
private ICConfigurationDescription fCfgDes; private ICConfigurationDescription fCfgDes;
private IProject fProject; private IProject fProject;
private COwner fOwner; private COwner fOwner;
private HashMap fDesMap = new HashMap(); private final HashMap fDesMap = new HashMap();
private HashMap fStorageDataElMap = new HashMap(); private final HashMap fStorageDataElMap = new HashMap();
private boolean fApplyOnChange = true; private boolean fApplyOnChange = true;
private boolean fIsDirty; private boolean fIsDirty;
private CDescriptorEvent fOpEvent; private CDescriptorEvent fOpEvent;
private boolean fIsOpStarted; private boolean fIsOpStarted;
class CConfigBaseDescriptorExtensionReference implements ICExtensionReference{ final class CConfigBaseDescriptorExtensionReference implements ICExtensionReference{
private ICConfigExtensionReference fCfgExtRef; private ICConfigExtensionReference fCfgExtRef;
CConfigBaseDescriptorExtensionReference(ICConfigExtensionReference cfgRef){ CConfigBaseDescriptorExtensionReference(ICConfigExtensionReference cfgRef){
fCfgExtRef = cfgRef; fCfgExtRef = cfgRef;
@ -191,14 +192,16 @@ public class CConfigBasedDescriptor implements ICDescriptor {
private CConfigBaseDescriptorExtensionReference create(ICConfigExtensionReference ref){ private CConfigBaseDescriptorExtensionReference create(ICConfigExtensionReference ref){
CConfigBaseDescriptorExtensionReference dr = new CConfigBaseDescriptorExtensionReference(ref); CConfigBaseDescriptorExtensionReference dr = new CConfigBaseDescriptorExtensionReference(ref);
ArrayList list = (ArrayList)fDesMap.get(ref.getExtensionPoint()); synchronized (fDesMap) {
if(list == null){ ArrayList list = (ArrayList)fDesMap.get(ref.getExtensionPoint());
list = new ArrayList(1); if(list == null){
fDesMap.put(ref.getExtensionPoint(), list); list = new ArrayList(1);
} else { fDesMap.put(ref.getExtensionPoint(), list);
list.ensureCapacity(list.size() + 1); } else {
list.ensureCapacity(list.size() + 1);
}
list.add(dr);
} }
list.add(dr);
return dr; return dr;
} }
@ -228,45 +231,47 @@ public class CConfigBasedDescriptor implements ICDescriptor {
} }
ICExtensionReference[] extRefs = new ICExtensionReference[cfgRefs.length]; ICExtensionReference[] extRefs = new ICExtensionReference[cfgRefs.length];
ArrayList list = (ArrayList)fDesMap.get(extensionPoint); synchronized (fDesMap) {
// if(list == null){ ArrayList list = (ArrayList)fDesMap.get(extensionPoint);
// list = new ArrayList(cfgRefs.length); // if(list == null){
// fDesMap.put(extensionPoint, list); // list = new ArrayList(cfgRefs.length);
// } // fDesMap.put(extensionPoint, list);
// }
// list = (ArrayList)list.clone(); // list = (ArrayList)list.clone();
// //
// CConfigBaseDescriptorExtensionReference[] refs = (CConfigBaseDescriptorExtensionReference[])list. // CConfigBaseDescriptorExtensionReference[] refs = (CConfigBaseDescriptorExtensionReference[])list.
// toArray(new CConfigBaseDescriptorExtensionReference[list.size()]); // toArray(new CConfigBaseDescriptorExtensionReference[list.size()]);
int num = cfgRefs.length - 1; int num = cfgRefs.length - 1;
for(int i = cfgRefs.length - 1; i >= 0; i--){ for(int i = cfgRefs.length - 1; i >= 0; i--){
ICConfigExtensionReference ref = cfgRefs[i]; ICConfigExtensionReference ref = cfgRefs[i];
int k = list != null ? list.size() - 1 : -1; int k = list != null ? list.size() - 1 : -1;
for(; k >= 0; k--){ for(; k >= 0; k--){
CConfigBaseDescriptorExtensionReference r = (CConfigBaseDescriptorExtensionReference)list.get(k); CConfigBaseDescriptorExtensionReference r = (CConfigBaseDescriptorExtensionReference)list.get(k);
if(r.fCfgExtRef == ref){ if(r.fCfgExtRef == ref){
extRefs[num--] = r; extRefs[num--] = r;
list.remove(k); list.remove(k);
break; break;
}
}
if(k < 0){
extRefs[num--] = new CConfigBaseDescriptorExtensionReference(ref);
} }
} }
if(k < 0){
extRefs[num--] = new CConfigBaseDescriptorExtensionReference(ref); if(list == null){
list = new ArrayList(cfgRefs.length);
fDesMap.put(extensionPoint, list);
} else {
list.clear();
list.ensureCapacity(cfgRefs.length);
} }
}
if(list == null){ list.addAll(Arrays.asList(extRefs));
list = new ArrayList(cfgRefs.length); list.trimToSize();
fDesMap.put(extensionPoint, list);
} else {
list.clear();
list.ensureCapacity(cfgRefs.length);
} }
list.addAll(Arrays.asList(extRefs));
list.trimToSize();
return extRefs; return extRefs;
} }