You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by kl...@apache.org on 2022/04/27 12:30:03 UTC
[camel] branch camel-3.14.x updated: CAMEL-17992: don't overwrite ssl from configuration with uri
This is an automated email from the ASF dual-hosted git repository.
klease pushed a commit to branch camel-3.14.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.14.x by this push:
new 287e0a1a824 CAMEL-17992: don't overwrite ssl from configuration with uri
287e0a1a824 is described below
commit 287e0a1a8244c905d6a1f63c18b246a4b183717b
Author: klease <kl...@cegetel.net>
AuthorDate: Wed Apr 27 14:27:51 2022 +0200
CAMEL-17992: don't overwrite ssl from configuration with uri
---
.../main/java/org/apache/camel/component/netty/NettyConfiguration.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
index 7ec81f0eebb..006eb844448 100644
--- a/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
+++ b/components/camel-netty/src/main/java/org/apache/camel/component/netty/NettyConfiguration.java
@@ -191,7 +191,7 @@ public class NettyConfiguration extends NettyServerBootstrapConfiguration implem
setPort(uri.getPort());
}
- ssl = component.getAndRemoveOrResolveReferenceParameter(parameters, "ssl", boolean.class, false);
+ ssl = component.getAndRemoveOrResolveReferenceParameter(parameters, "ssl", boolean.class, ssl);
sslHandler = component.getAndRemoveOrResolveReferenceParameter(parameters, "sslHandler", SslHandler.class, sslHandler);
passphrase = component.getAndRemoveOrResolveReferenceParameter(parameters, "passphrase", String.class, passphrase);
keyStoreFormat = component.getAndRemoveOrResolveReferenceParameter(parameters, "keyStoreFormat", String.class,