(camel) branch camel-3.22.x updated (8803f11b309 -> 5bd776f324a)

[gz...@apache.org]

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

gzurowski pushed a change to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git


 discard 8803f11b309 Fix try-with-resources for Java 8
     new 5bd776f324a Fix try-with-resources for Java 8

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (8803f11b309)
            \
             N -- N -- N   refs/heads/camel-3.22.x (5bd776f324a)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java  | 1 -
 1 file changed, 1 deletion(-)

(camel) 01/01: Fix try-with-resources for Java 8

[gz...@apache.org]

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

gzurowski pushed a commit to branch camel-3.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 5bd776f324a3503a31472ed5f7bf5e9b90a2df8a
Author: Gregor Zurowski <gr...@zurowski.org>
AuthorDate: Tue Dec 19 11:31:37 2023 +0100

    Fix try-with-resources for Java 8
---
 .../java/org/apache/camel/support/jsse/KeyStoreParameters.java   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java b/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
index 00476901949..d45feba335e 100644
--- a/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
+++ b/core/camel-api/src/main/java/org/apache/camel/support/jsse/KeyStoreParameters.java
@@ -189,11 +189,10 @@ public class KeyStoreParameters extends JsseParameters {
         if (this.resource == null) {
             ks.load(null, ksPassword);
         } else {
-            InputStream is = this.resolveResource(this.parsePropertyValue(this.resource));
-            if (is == null) {
-                LOG.warn("No keystore could be found at {}.", this.resource);
-            } else {
-                try (is) {
+            try (InputStream is = this.resolveResource(this.parsePropertyValue(this.resource))) {
+                if (is == null) {
+                    LOG.warn("No keystore could be found at {}.", this.resource);
+                } else {
                     ks.load(is, ksPassword);
                 }
             }