Updated Branches: refs/heads/master a211fbbb9 -> ea73ffedc
Let's get rid of the compilation error without a nasty cast when Java 7 is in use. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea73ffed Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea73ffed Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea73ffed Branch: refs/heads/master Commit: ea73ffedc020009567142efc9a6195b3da47faed Parents: a211fbb Author: Babak Vahdat <bvah...@apache.org> Authored: Sun Jul 7 21:03:19 2013 +0200 Committer: Babak Vahdat <bvah...@apache.org> Committed: Sun Jul 7 21:03:19 2013 +0200 ---------------------------------------------------------------------- .../apache/camel/test/blueprint/CamelBlueprintHelper.java | 10 ++-------- .../camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ea73ffed/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java index 8849e64..8a0ff66 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintHelper.java @@ -177,14 +177,8 @@ public final class CamelBlueprintHelper { File load = new File(fileName); LOG.debug("Loading properties from OSGi config admin file: {}", load); org.apache.felix.utils.properties.Properties cfg = new org.apache.felix.utils.properties.Properties(load); - Iterator<String> it = cfg.keySet().iterator(); - while (it.hasNext()) { - String key = it.next(); - // must force type cast to have code compile with both java6 - // and 7 with the - // (org.apache.felix.utils.properties.Properties) - String value = (String)cfg.get(key); - props.put(key, value); + for (Object key : cfg.keySet()) { + props.put(key, cfg.get(key)); } ConfigurationAdmin configAdmin = CamelBlueprintHelper http://git-wip-us.apache.org/repos/asf/camel/blob/ea73ffed/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java index a5ec967..eb970f5 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java @@ -135,7 +135,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { CamelBlueprintHelper.disposeBundleContext(threadLocalBundleContext.get()); threadLocalBundleContext.remove(); } - tearDownAfterClass(); + CamelTestSupport.tearDownAfterClass(); } /**
