You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by dk...@apache.org on 2012/09/11 20:25:30 UTC
svn commit: r1383508 -
/camel/branches/camel-2.9.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java
Author: dkulp
Date: Tue Sep 11 18:25:30 2012
New Revision: 1383508
URL: http://svn.apache.org/viewvc?rev=1383508&view=rev
Log:
Merged revisions 1379710 via git cherry-pick from
https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........
r1379710 | davsclaus | 2012-09-01 03:35:43 -0400 (Sat, 01 Sep 2012) | 2 lines
CAMEL-5543: Fixed possible NPE in camel:route-list karaf command.
........
Modified:
camel/branches/camel-2.9.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java
Modified: camel/branches/camel-2.9.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java?rev=1383508&r1=1383507&r2=1383508&view=diff
==============================================================================
--- camel/branches/camel-2.9.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java (original)
+++ camel/branches/camel-2.9.x/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java Tue Sep 11 18:25:30 2012
@@ -20,6 +20,7 @@ import java.util.LinkedList;
import java.util.List;
import org.apache.camel.CamelContext;
+import org.apache.camel.ServiceStatus;
import org.apache.camel.model.RouteDefinition;
import org.apache.felix.gogo.commands.Argument;
import org.apache.felix.gogo.commands.Command;
@@ -62,8 +63,8 @@ public class RouteList extends OsgiComma
if (routeDefinitions != null && !routeDefinitions.isEmpty()) {
for (RouteDefinition routeDefinition : routeDefinitions) {
String contextName = camelContext.getName();
- String status = camelContext.getRouteStatus(routeDefinition.getId()).name();
- System.out.println(String.format(OUTPUT_FORMAT, routeDefinition.getId(), contextName, status));
+ ServiceStatus status = camelContext.getRouteStatus(routeDefinition.getId());
+ System.out.println(String.format(OUTPUT_FORMAT, routeDefinition.getId(), contextName, status != null ? status.name() : UNKNOWN));
}
}
}