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

bug 348884: ConcurrentModificationException in StorableCdtVariables

Browse source
This commit is contained in:
Andrew Gvozdev 2012-06-19 17:01:22 -04:00
parent 582b358f0f
commit aa4abe428d
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
core/org.eclipse.cdt.core.tests/misc/org/eclipse/cdt/utils/StorableCdtVariablesTest.java
View file

@ -12,7 +12,8 @@
package org.eclipse.cdt.utils; package org.eclipse.cdt.utils;
import java.util.ConcurrentModificationException; import java.util.ArrayList;
import java.util.List;
import junit.framework.Test; import junit.framework.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
@ -39,8 +40,8 @@ public class StorableCdtVariablesTest extends TestCase {
ResourceHelper.cleanUp(); ResourceHelper.cleanUp();
} }
/* /**
* Unit test for Bugzilla #348884 * Unit test for bug 348884
*/ */
public void testSetMacros() throws Exception { public void testSetMacros() throws Exception {
IProject project = ResourceHelper.createCDTProjectWithConfig("projectWithUserVars"); //$NON-NLS-1$ IProject project = ResourceHelper.createCDTProjectWithConfig("projectWithUserVars"); //$NON-NLS-1$
@ -59,16 +60,28 @@ public class StorableCdtVariablesTest extends TestCase {
try{ try{
supplier.setMacros(new ICdtVariable[]{varA1, varA2, varA3, varA4}, desc); supplier.setMacros(new ICdtVariable[]{varA1, varA2, varA3, varA4}, desc);
}catch(Throwable e){ }catch(Throwable e){
fail("1.0 Cannot set macros"); //$NON-NLS-1$ fail(e.toString());
} }
ICdtVariable[] vars = supplier.getMacros(desc);
List<String> macroStrings = new ArrayList<String>();
for (ICdtVariable var : vars) {
macroStrings.add(var.getName() + '=' + var.getStringValue());
}
assertTrue(macroStrings.contains(varA1.getName() + '=' + varA1.getStringValue()));
assertTrue(macroStrings.contains(varA2.getName() + '=' + varA2.getStringValue()));
assertTrue(macroStrings.contains(varA3.getName() + '=' + varA3.getStringValue()));
assertTrue(macroStrings.contains(varA4.getName() + '=' + varA4.getStringValue()));
assertEquals(4, macroStrings.size());
try{ try{
supplier.setMacros(new ICdtVariable[]{varA1, varA2, varA5}, desc); supplier.setMacros(new ICdtVariable[]{varA1, varA2, varA5}, desc);
}catch(ConcurrentModificationException e){
fail("1.1 Bugzilla #348884 unresolved"); //$NON-NLS-1$
}catch(Exception e){ }catch(Exception e){
fail("1.2 Cannot set macros"); //$NON-NLS-1$ fail(e.toString());
} }
assertTrue(macroStrings.contains(varA1.getName() + '=' + varA1.getStringValue()));
assertTrue(macroStrings.contains(varA2.getName() + '=' + varA2.getStringValue()));
assertTrue(macroStrings.contains(varA5.getName() + '=' + varA5.getStringValue()));
assertEquals(3, macroStrings.size());
} }
} }

5
core/org.eclipse.cdt.core/src/org/eclipse/cdt/internal/core/cdtvariables/StorableCdtVariables.java
View file

@ -173,7 +173,7 @@ public class StorableCdtVariables implements IStorableCdtVariables {
return null; return null;
} }
/* /**
* sets the storable macros to hold the geven number of macros * sets the storable macros to hold the geven number of macros
* all macros that are present in the store but not included in the given array * all macros that are present in the store but not included in the given array
* will be removed * will be removed
@ -185,9 +185,6 @@ public class StorableCdtVariables implements IStorableCdtVariables {
deleteAll(); deleteAll();
else{ else{
if (getMap().size() != 0) { if (getMap().size() != 0) {
/*
* Fix for Bugzilla #348884
*/
Set<String> existing = new HashSet<String>(); Set<String> existing = new HashSet<String>();
Set<String> macroNames = new HashSet<String>(); Set<String> macroNames = new HashSet<String>();