You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ha...@apache.org on 2010/10/07 08:01:20 UTC
svn commit: r1005333 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/impl/DefaultCamelContext.java
test/java/org/apache/camel/impl/DefaultCamelContextTest.java
Author: hadrian
Date: Thu Oct 7 06:01:20 2010
New Revision: 1005333
URL: http://svn.apache.org/viewvc?rev=1005333&view=rev
Log:
CAMEL-3198. Fix NPE in DefaultCamelContext. Thanks to Stefan for proposed fix.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1005333&r1=1005332&r2=1005333&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Thu Oct 7 06:01:20 2010
@@ -512,7 +512,7 @@ public class DefaultCamelContext extends
}
public Route getRoute(String id) {
- for (Route route : routes) {
+ for (Route route : getRoutes()) {
if (route.getId().equals(id)) {
return route;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java?rev=1005333&r1=1005332&r2=1005333&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/impl/DefaultCamelContextTest.java Thu Oct 7 06:01:20 2010
@@ -224,6 +224,11 @@ public class DefaultCamelContextTest ext
public void testGetRouteById() throws Exception {
DefaultCamelContext ctx = new DefaultCamelContext();
ctx.disableJMX();
+
+ // should not throw NPE (CAMEL-3198)
+ Route route = ctx.getRoute("coolRoute");
+ assertNull(route);
+
ctx.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
@@ -232,7 +237,7 @@ public class DefaultCamelContextTest ext
});
ctx.start();
- Route route = ctx.getRoute("coolRoute");
+ route = ctx.getRoute("coolRoute");
assertNotNull(route);
assertEquals("coolRoute", route.getId());
assertEquals("direct://start", route.getConsumer().getEndpoint().getEndpointUri());