Repository: karaf Updated Branches: refs/heads/karaf-2.x 22614b2a3 -> 9c59314a4
[KARAF-1560] Fixing ConfigCommandSupport test with the latest changes Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9c59314a Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9c59314a Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9c59314a Branch: refs/heads/karaf-2.x Commit: 9c59314a4c53dee23a69eb7923a2753d0ccaf52d Parents: 22614b2 Author: Jean-Baptiste Onofré <jbono...@apache.org> Authored: Thu Jul 10 15:31:35 2014 +0200 Committer: Jean-Baptiste Onofré <jbono...@apache.org> Committed: Thu Jul 10 15:31:35 2014 +0200 ---------------------------------------------------------------------- .../java/org/apache/karaf/shell/config/ConfigCommandSupport.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/9c59314a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java ---------------------------------------------------------------------- diff --git a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java b/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java index 111bcf7..b1cf429 100644 --- a/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java +++ b/shell/config/src/main/java/org/apache/karaf/shell/config/ConfigCommandSupport.java @@ -182,7 +182,8 @@ public abstract class ConfigCommandSupport extends OsgiCommandSupport { } // remove "removed" properties from the file ArrayList<String> propertiesToRemove = new ArrayList<String>(); - for (String key : p.keySet()) { + for (Object current : p.keySet()) { + String key = (String) current; if (props.get(key) == null && !Constants.SERVICE_PID.equals(key) && !ConfigurationAdmin.SERVICE_FACTORYPID.equals(key)
