Author: hibou
Date: Sat Nov 20 09:50:58 2010
New Revision: 1037148
URL: http://svn.apache.org/viewvc?rev=1037148&view=rev
Log:
IVY-1250 : clone the system properties before using it so we can avoid some
ConcurrentModificationException
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1037148&r1=1037147&r2=1037148&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Sat Nov 20 09:50:58 2010
@@ -123,6 +123,7 @@ for detailed view of each issue, please
- FIX: Only the last dependency descriptor is taken into account on the same
module (IVY-1240)
- FIX: UseCacheOnly doesn't respect the cache configuration in the ivysettings
(IVY-1227)
- FIX: UseCacheOnly is influenced by the TTL on cached metadata (IVY-1243)
+- FIX: ConcurrentModificationException on ivy settings loading (IVY-1250)
2.2.0
=====================================
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java?rev=1037148&r1=1037147&r2=1037148&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/core/settings/IvySettings.java
Sat Nov 20 09:50:58 2010
@@ -297,7 +297,7 @@ public class IvySettings implements Sort
private void addSystemProperties() {
try {
- addAllVariables(System.getProperties());
+ addAllVariables((Map) System.getProperties().clone());
} catch (AccessControlException ex) {
Message.verbose(
"access denied to getting all system properties: they won't be
available as Ivy variables."
