camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [5/5] camel git commit: CAMEL-8044: Camel commands should be more reusable for remote JVMs
Date Wed, 10 Dec 2014 17:57:01 GMT
CAMEL-8044: Camel commands should be more reusable for remote JVMs


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e4009f49
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e4009f49
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e4009f49

Branch: refs/heads/master
Commit: e4009f49419a7685da59cd40c2fb771e2ade1012
Parents: 453e405
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Wed Dec 10 18:55:45 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Wed Dec 10 18:56:48 2014 +0100

----------------------------------------------------------------------
 .../java/org/apache/camel/commands/AbstractCamelController.java  | 4 ++--
 .../java/org/apache/camel/commands/EndpointExplainCommand.java   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/e4009f49/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
index 9480662..8c90cca 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
@@ -116,7 +116,7 @@ public abstract class AbstractCamelController implements CamelController
{
         return answer;
     }
 
-    public void resetRouteStats(String camelContextName) throws Exception{
+    public void resetRouteStats(String camelContextName) throws Exception {
         CamelContext context = this.getCamelContext(camelContextName);
         if (context == null) {
             return;
@@ -441,7 +441,7 @@ public abstract class AbstractCamelController implements CamelController
{
         for (String label : labels) {
             List<Map<String, String>> components = listComponentsCatalog(label);
             if (!components.isEmpty()) {
-                Set<String> names = new LinkedHashSet<>();
+                Set<String> names = new LinkedHashSet<String>();
                 for (Map<String, String> info : components) {
                     String name = info.get("name");
                     if (name != null) {

http://git-wip-us.apache.org/repos/asf/camel/blob/e4009f49/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java
b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java
index 8ff4368..dcf8e4c 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/EndpointExplainCommand.java
@@ -63,6 +63,9 @@ public class EndpointExplainCommand extends AbstractContextCommand {
 
         for (Map<String, String> row : endpoints) {
             String json = camelController.explainEndpointAsJSon(context, row.get("uri"),
verbose);
+            if (json == null) {
+                continue;
+            }
 
             out.println("Context:\t" + context);
 


Mime
View raw message