You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gg...@apache.org on 2015/12/12 20:36:40 UTC
[3/3] camel git commit: CS fixes
CS fixes
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/02ce9b18
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/02ce9b18
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/02ce9b18
Branch: refs/heads/camel-2.15.x
Commit: 02ce9b18358366f876be28c41078b305721a5b84
Parents: d2fad93
Author: Grzegorz Grzybek <gr...@gmail.com>
Authored: Sat Dec 12 20:36:08 2015 +0100
Committer: Grzegorz Grzybek <gr...@gmail.com>
Committed: Sat Dec 12 20:36:08 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/test/blueprint/CamelBlueprintHelper.java | 6 ++++--
.../src/main/java/org/apache/camel/test/blueprint/Main.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/02ce9b18/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 7b117e7..8cc8ef2 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
@@ -136,7 +136,7 @@ public final class CamelBlueprintHelper {
// fully deleted between tests
createDirectory("target/test-bundles");
- List<BundleDescriptor> bundles = new LinkedList<>();
+ List<BundleDescriptor> bundles = new LinkedList<BundleDescriptor>();
if (bundle != null) {
String jarName = name.toLowerCase(Locale.ENGLISH) + "-" + uid + ".jar";
@@ -533,7 +533,9 @@ public final class CamelBlueprintHelper {
try {
CamelBlueprintHelper.setPersistentFileForConfigAdmin(context, pf[0], new URI(pf[1]).getPath(),
new Properties(), null, null, false);
- } catch (IOException | URISyntaxException e) {
+ } catch (IOException e) {
+ throw new RuntimeException(e.getMessage(), e);
+ } catch (URISyntaxException e) {
throw new RuntimeException(e.getMessage(), e);
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
http://git-wip-us.apache.org/repos/asf/camel/blob/02ce9b18/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 76ad3b0..a22756e 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
@@ -107,7 +107,7 @@ public class Main extends MainSupport {
} else {
bundleContext = createBundleContext(bundleName);
}
- Set<Long> eventHistory = new HashSet<>();
+ Set<Long> eventHistory = new HashSet<Long>();
CamelBlueprintHelper.waitForBlueprintContainer(eventHistory, bundleContext, bundleName, BlueprintEvent.CREATED, null);