CS fixes (cherry picked from commit cfe9cc31829e3c822c31a08d6a7ad92a5f9269ca)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d2fad932 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d2fad932 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d2fad932 Branch: refs/heads/camel-2.15.x Commit: d2fad932e4aaa71175d18251c65210b646273a68 Parents: bd900b3 Author: Grzegorz Grzybek <gr.grzy...@gmail.com> Authored: Sat Dec 12 20:18:22 2015 +0100 Committer: Grzegorz Grzybek <gr.grzy...@gmail.com> Committed: Sat Dec 12 20:21:06 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 3 ++- .../apache/camel/test/blueprint/CamelBlueprintTestSupport.java | 2 +- .../src/main/java/org/apache/camel/test/blueprint/Main.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d2fad932/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 106e0ed..7b117e7 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 @@ -145,7 +145,8 @@ public final class CamelBlueprintHelper { List<BundleDescriptor> bundleDescriptors = getBundleDescriptors(bundleFilter); // let's put configadmin before blueprint.core - int idx1=-1, idx2=-1; + int idx1 = -1; + int idx2 = -1; for (int i = 0; i < bundleDescriptors.size(); i++) { BundleDescriptor bd = bundleDescriptors.get(i); if ("org.apache.felix.configadmin".equals(bd.getHeaders().get("Bundle-SymbolicName"))) { http://git-wip-us.apache.org/repos/asf/camel/blob/d2fad932/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 33c819b..adda7bf 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 @@ -167,7 +167,7 @@ public abstract class CamelBlueprintTestSupport extends CamelTestSupport { if (currentProperties == null) { currentProperties = newProps; } - for (Enumeration<String> ek = currentProperties.keys(); ek.hasMoreElements(); ) { + for (Enumeration<String> ek = currentProperties.keys(); ek.hasMoreElements();) { String k = ek.nextElement(); newProps.put(k, currentProperties.get(k)); } http://git-wip-us.apache.org/repos/asf/camel/blob/d2fad932/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java ---------------------------------------------------------------------- diff --git a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java index cd6894b..76ad3b0 100644 --- a/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java +++ b/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/Main.java @@ -103,7 +103,7 @@ public class Main extends MainSupport { LOG.debug("Starting Blueprint XML file: " + descriptors); if (configAdminPid != null && configAdminFileName != null) { // pid/file is used to set INITIAL content of ConfigAdmin to be used when blueprint container is started - bundleContext = createBundleContext(bundleName, new String[] { configAdminFileName, configAdminPid }); + bundleContext = createBundleContext(bundleName, new String[] {configAdminFileName, configAdminPid}); } else { bundleContext = createBundleContext(bundleName); }
