[camel] branch main updated: CAMEL-17992: don't overwrite ssl from configuration with uri (#7499)

[klease]

This is an automated email from the ASF dual-hosted git repository.

klease pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 2715406f314 CAMEL-17992: don't overwrite ssl from configuration with 
uri (#7499)
2715406f314 is described below

commit 2715406f31446cc51dd5df177130f02a4ea1d150
Author: klease <38634989+kle...@users.noreply.github.com>
AuthorDate: Tue Apr 26 20:37:03 2022 +0200

    CAMEL-17992: don't overwrite ssl from configuration with uri (#7499)
---
 .../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 24a5e4f1c1e..823fca69a6c 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,