Author: davsclaus Date: Sat Sep 1 07:34:28 2012 New Revision: 1379709 URL: http://svn.apache.org/viewvc?rev=1379709&view=rev Log: CAMEL-5543: Fixed possible NPE in camel:route-list karaf command.
Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java Modified: camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java?rev=1379709&r1=1379708&r2=1379709&view=diff ============================================================================== --- camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java (original) +++ camel/trunk/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/RouteList.java Sat Sep 1 07:34:28 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)); } } }