Updated Branches: refs/heads/camel-2.10.x ab76a81ad -> 24b266018 refs/heads/camel-2.11.x 968ad485a -> f27b776b5
CAMEL-6611: Must close SSL on exception so client is notified asap. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f27b776b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f27b776b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f27b776b Branch: refs/heads/camel-2.11.x Commit: f27b776b554c0d30ed4ed082c6f4a4bc3c0fd5ac Parents: 968ad48 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Aug 6 15:36:05 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Aug 6 15:38:16 2013 +0200 ---------------------------------------------------------------------- .../apache/camel/component/netty/DefaultClientPipelineFactory.java | 2 ++ .../apache/camel/component/netty/DefaultServerPipelineFactory.java | 2 ++ 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f27b776b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java index 9503fac..e5c9975 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultClientPipelineFactory.java @@ -53,6 +53,8 @@ public class DefaultClientPipelineFactory extends ClientPipelineFactory { SslHandler sslHandler = configureClientSSLOnDemand(); if (sslHandler != null) { + // must close on SSL exception + sslHandler.setCloseOnSSLException(true); LOG.debug("Client SSL handler configured and added to the ChannelPipeline: {}", sslHandler); addToPipeline("ssl", channelPipeline, sslHandler); } http://git-wip-us.apache.org/repos/asf/camel/blob/f27b776b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java index 11ed386..3d2584d 100644 --- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java +++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/DefaultServerPipelineFactory.java @@ -52,6 +52,8 @@ public class DefaultServerPipelineFactory extends ServerPipelineFactory { SslHandler sslHandler = configureServerSSLOnDemand(); if (sslHandler != null) { + // must close on SSL exception + sslHandler.setCloseOnSSLException(true); LOG.debug("Server SSL handler configured and added as an interceptor against the ChannelPipeline: {}", sslHandler); addToPipeline("ssl", channelPipeline, sslHandler); }
