Repository: camel Updated Branches: refs/heads/camel-2.12.x b4cb381c7 -> 4e3a0e5d0 refs/heads/camel-2.13.x c07c9ed6e -> 3c7bfcc65
CAMEL-7642 Removed the System.out and polished the warning log Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/4e3a0e5d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/4e3a0e5d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/4e3a0e5d Branch: refs/heads/camel-2.12.x Commit: 4e3a0e5d00f6f6ed83c90bc6b83869b029f396a5 Parents: b4cb381 Author: Willem Jiang <willem.ji...@gmail.com> Authored: Tue Jul 29 10:47:15 2014 +0800 Committer: Willem Jiang <willem.ji...@gmail.com> Committed: Tue Jul 29 10:48:33 2014 +0800 ---------------------------------------------------------------------- .../component/netty/http/handlers/HttpServerChannelHandler.java | 2 +- .../netty/http/handlers/HttpServerMultiplexChannelHandler.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/4e3a0e5d/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java index d4ff8dc..8c15847 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerChannelHandler.java @@ -267,7 +267,7 @@ public class HttpServerChannelHandler extends ServerChannelHandler { @Override public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent exceptionEvent) throws Exception { - System.out.println("Get the exception here" + exceptionEvent); + // only close if we are still allowed to run if (consumer.isRunAllowed()) { http://git-wip-us.apache.org/repos/asf/camel/blob/4e3a0e5d/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java ---------------------------------------------------------------------- diff --git a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java index 3c219f6..5075170 100644 --- a/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java +++ b/components/camel-netty-http/src/main/java/org/apache/camel/component/netty/http/handlers/HttpServerMultiplexChannelHandler.java @@ -118,7 +118,7 @@ public class HttpServerMultiplexChannelHandler extends SimpleChannelUpstreamHand handler.exceptionCaught(ctx, e); } else { // we cannot throw the exception here - LOG.warn("HttpServerChannelHandler is not found as attachment for exception {}, send 404 back to the client.", e.getCause()); + LOG.warn("HttpServerChannelHandler is not found as attachment to handle exception, send 404 back to the client.", e.getCause()); // Now we just send 404 back to the client HttpResponse response = new DefaultHttpResponse(HTTP_1_1, NOT_FOUND); response.headers().set(Exchange.CONTENT_TYPE, "text/plain");
