You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2014/10/28 22:37:32 UTC
[29/35] git commit: IVYDE-372: fix ClassCastException: System
properties may not be strings
IVYDE-372: fix ClassCastException: System properties may not be strings
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/81fec319
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/81fec319
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/81fec319
Branch: refs/heads/2.4.x
Commit: 81fec3193ad12a0f78eb021c4a1548484595860b
Parents: a6b9ca3
Author: Carsten Pfeiffer <ca...@gebit.de>
Authored: Wed Sep 24 10:23:19 2014 +0200
Committer: Nicolas LaleveĢe <ni...@hibnet.org>
Committed: Sun Sep 28 02:07:17 2014 +0200
----------------------------------------------------------------------
src/java/org/apache/ivy/core/settings/IvySettings.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/81fec319/src/java/org/apache/ivy/core/settings/IvySettings.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/core/settings/IvySettings.java b/src/java/org/apache/ivy/core/settings/IvySettings.java
index 5c99787..1ef8dc7 100644
--- a/src/java/org/apache/ivy/core/settings/IvySettings.java
+++ b/src/java/org/apache/ivy/core/settings/IvySettings.java
@@ -604,11 +604,13 @@ public class IvySettings implements SortEngineSettings, PublishEngineSettings, P
addAllVariables(variables, true);
}
- public synchronized void addAllVariables(Map variables, boolean overwrite) {
- for (Iterator iter = variables.keySet().iterator(); iter.hasNext();) {
- String key = (String) iter.next();
- String val = (String) variables.get(key);
- setVariable(key, val, overwrite);
+ public synchronized void addAllVariables(Map<?, ?> variables, boolean overwrite) {
+ for (Map.Entry<?, ?> entry : variables.entrySet()) {
+ String key = entry.getKey().toString();
+ Object val = entry.getValue();
+ if (val == null || val instanceof String) {
+ setVariable(key, (String) val, overwrite);
+ }
}
}