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/09/28 02:11:15 UTC
[1/2] git commit: IVYDE-372: fix ClassCastException: System
properties may not be strings
Repository: ant-ivy
Updated Branches:
refs/heads/master a6b9ca3f7 -> 5f9c83bd9
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/master
Commit: 81fec3193ad12a0f78eb021c4a1548484595860b
Parents: a6b9ca3
Author: Carsten Pfeiffer <ca...@gebit.de>
Authored: Wed Sep 24 10:23:19 2014 +0200
Committer: Nicolas Lalevé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);
+ }
}
}
[2/2] git commit: document the fix of IVY-1487
Posted by hi...@apache.org.
document the fix of IVY-1487
Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/5f9c83bd
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/5f9c83bd
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/5f9c83bd
Branch: refs/heads/master
Commit: 5f9c83bd976802eea2d940b70aa749fd58b4cb46
Parents: 81fec31
Author: Nicolas Lalevée <ni...@hibnet.org>
Authored: Sun Sep 28 02:10:48 2014 +0200
Committer: Nicolas Lalevée <ni...@hibnet.org>
Committed: Sun Sep 28 02:10:48 2014 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/5f9c83bd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ddf8591..7fde7ff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -102,6 +102,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
Douglas Palmer
Jesper Pedersen
Emmanuel Pellereau
+ Carsten Pfeiffer
Yanus Poluektovich
Roshan Punnoose
Jean-Baptiste Quenot
@@ -150,6 +151,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
- FIX: regression introduced by IVY-1457, dependency management wasn't properly handled introducing lots of resolution failures
- FIX: The SSH resolvers fails if the un-required jsch jar is missing (IVY-1471)
- FIX: failed to resolve dynamic revisions in some cases for URL repositories (IVY-1472)
+- FIX: ClassCastException in Eclipse 4.4.1 (IVY-1487) (Thanks to Carsten Pfeiffer)
2.4.0-rc1
=====================================