You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/12/02 21:27:56 UTC
svn commit: r1416251 - in /camel/branches/camel-2.10.x: ./
camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
Author: bvahdat
Date: Sun Dec 2 20:27:55 2012
New Revision: 1416251
URL: http://svn.apache.org/viewvc?rev=1416251&view=rev
Log:
Merged revisions 1416246 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1416246 | bvahdat | 2012-12-02 21:21:27 +0100 (So, 02 Dez 2012) | 1 line
Polished.
........
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1416246
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java?rev=1416251&r1=1416250&r2=1416251&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java Sun Dec 2 20:27:55 2012
@@ -1852,9 +1852,9 @@ public class DefaultCamelContext extends
protected void logRouteState(Route route, String state) {
if (log.isInfoEnabled()) {
if (route.getConsumer() != null) {
- log.info("Route: {} {}, was consuming from: {}", new Object[]{route.getId(), state, route.getConsumer().getEndpoint()});
+ log.info("Route: {} is {}, was consuming from: {}", new Object[]{route.getId(), state, route.getConsumer().getEndpoint()});
} else {
- log.info("Route: {} {}.", route.getId(), state);
+ log.info("Route: {} is {}.", route.getId(), state);
}
}
}
@@ -1862,7 +1862,7 @@ public class DefaultCamelContext extends
protected synchronized void stopRouteService(RouteService routeService) throws Exception {
routeService.stop();
for (Route route : routeService.getRoutes()) {
- logRouteState(route, "stoped");
+ logRouteState(route, "stopped");
}
}
Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java?rev=1416251&r1=1416250&r2=1416251&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperEndpointTest.java Sun Dec 2 20:27:55 2012
@@ -24,7 +24,7 @@ public class ZooKeeperEndpointTest exten
@Test
public void awaitExistenceOptionOnEndpoint() {
ZooKeeperEndpoint endpoint = context.getEndpoint("zookeeper:someserver/zoo", ZooKeeperEndpoint.class);
- assertTrue("The awaitExistence option defaults to true", endpoint.getAwaitExistence());
+ assertTrue("The awaitExistence option should default to true", endpoint.getAwaitExistence());
endpoint = context.getEndpoint("zookeeper:someserver/zoo?awaitExistence=true", ZooKeeperEndpoint.class);
assertTrue("The awaitExistence option should be true", endpoint.getAwaitExistence());