Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2011-10-07 16:59:10 +0000
committerThomas Watson2011-10-07 16:59:10 +0000
commit1942955bea5b662738e7511a90704d16852ed272 (patch)
tree75e80d263d19cbcf612b5dbca06de54475369aaf
parent65bf03fd1534709f0409805929fc34041c2683f9 (diff)
downloadrt.equinox.framework-1942955bea5b662738e7511a90704d16852ed272.tar.gz
rt.equinox.framework-1942955bea5b662738e7511a90704d16852ed272.tar.xz
rt.equinox.framework-1942955bea5b662738e7511a90704d16852ed272.zip
Bug 360198 - ConcurrentModificationException during framework snapshotv20111010-1614
-rw-r--r--bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java
index 7cf733628..7767c0512 100644
--- a/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java
+++ b/bundles/org.eclipse.osgi/supplement/src/org/eclipse/osgi/framework/internal/core/FrameworkProperties.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2010 Cognos Incorporated, IBM Corporation and others.
+ * Copyright (c) 2006, 2011 Cognos Incorporated, IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -79,7 +79,10 @@ public class FrameworkProperties {
// snapshot of System properties for uses of getProperties who expect to see framework properties set as System properties
// we need to do this for all system properties because the properties object is used to back
// BundleContext#getProperty method which expects all system properties to be available
- properties.putAll(systemProperties);
+ synchronized (systemProperties) {
+ // bug 360198 - must synchronize on systemProperties to avoid concurrent modification exception
+ properties.putAll(systemProperties);
+ }
}
}
return properties;

Back to the top