(tomcat) branch main updated: Work around weird spotbugs crash

2025-04-11 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 40c623f477 Work around weird spotbugs crash
40c623f477 is described below

commit 40c623f477e5e88bf3d96de3d7821b01df25e6e9
Author: remm 
AuthorDate: Fri Apr 11 14:55:33 2025 +0200

Work around weird spotbugs crash
---
 .../apache/tomcat/util/openssl/openssl_h_Compatibility.java  | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java 
b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
index 2ac4e437a5..ae8ae82c9e 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
@@ -297,17 +297,9 @@ public class openssl_h_Compatibility {
  * }
  */
 public static int ENGINE_register_all_complete() {
-class Holder {
-static final FunctionDescriptor DESC = FunctionDescriptor.of(
-openssl_h.C_INT);
-
-static final MethodHandle MH = 
Linker.nativeLinker().downcallHandle(
-openssl_h.findOrThrow("ENGINE_register_all_complete"),
-DESC);
-}
-var mh$ = Holder.MH;
 try {
-return (int) mh$.invokeExact();
+return (int) 
Linker.nativeLinker().downcallHandle(openssl_h.findOrThrow("ENGINE_register_all_complete"),
+FunctionDescriptor.of(JAVA_INT)).invokeExact();
 } catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



(tomcat) branch 11.0.x updated: Work around weird spotbugs crash

2025-04-11 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/11.0.x by this push:
 new f3e2267960 Work around weird spotbugs crash
f3e2267960 is described below

commit f3e2267960d776bad929fb91fee02434507f7f33
Author: remm 
AuthorDate: Fri Apr 11 14:55:33 2025 +0200

Work around weird spotbugs crash
---
 .../apache/tomcat/util/openssl/openssl_h_Compatibility.java  | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java 
b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
index 2ac4e437a5..ae8ae82c9e 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
@@ -297,17 +297,9 @@ public class openssl_h_Compatibility {
  * }
  */
 public static int ENGINE_register_all_complete() {
-class Holder {
-static final FunctionDescriptor DESC = FunctionDescriptor.of(
-openssl_h.C_INT);
-
-static final MethodHandle MH = 
Linker.nativeLinker().downcallHandle(
-openssl_h.findOrThrow("ENGINE_register_all_complete"),
-DESC);
-}
-var mh$ = Holder.MH;
 try {
-return (int) mh$.invokeExact();
+return (int) 
Linker.nativeLinker().downcallHandle(openssl_h.findOrThrow("ENGINE_register_all_complete"),
+FunctionDescriptor.of(JAVA_INT)).invokeExact();
 } catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



(tomcat) branch 9.0.x updated: Work around weird spotbugs crash

2025-04-11 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 42bbd7feaf Work around weird spotbugs crash
42bbd7feaf is described below

commit 42bbd7feaf0a4771b0f229fccfe0c6c6151f67e1
Author: remm 
AuthorDate: Fri Apr 11 14:55:33 2025 +0200

Work around weird spotbugs crash
---
 .../apache/tomcat/util/openssl/openssl_h_Compatibility.java  | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java 
b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
index f7322de3ca..81148f9693 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
@@ -296,17 +296,9 @@ public class openssl_h_Compatibility {
  * }
  */
 public static int ENGINE_register_all_complete() {
-class Holder {
-static final FunctionDescriptor DESC = FunctionDescriptor.of(
-openssl_h.C_INT);
-
-static final MethodHandle MH = 
Linker.nativeLinker().downcallHandle(
-openssl_h.findOrThrow("ENGINE_register_all_complete"),
-DESC);
-}
-var mh$ = Holder.MH;
 try {
-return (int) mh$.invokeExact();
+return (int) 
Linker.nativeLinker().downcallHandle(openssl_h.findOrThrow("ENGINE_register_all_complete"),
+FunctionDescriptor.of(JAVA_INT)).invokeExact();
 } catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



(tomcat) branch 10.1.x updated: Work around weird spotbugs crash

2025-04-11 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/10.1.x by this push:
 new e187172216 Work around weird spotbugs crash
e187172216 is described below

commit e187172216096bba0d93bb6b651c95deb20e6550
Author: remm 
AuthorDate: Fri Apr 11 14:55:33 2025 +0200

Work around weird spotbugs crash
---
 .../apache/tomcat/util/openssl/openssl_h_Compatibility.java  | 12 ++--
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java 
b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
index f7322de3ca..81148f9693 100644
--- a/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
+++ b/java/org/apache/tomcat/util/openssl/openssl_h_Compatibility.java
@@ -296,17 +296,9 @@ public class openssl_h_Compatibility {
  * }
  */
 public static int ENGINE_register_all_complete() {
-class Holder {
-static final FunctionDescriptor DESC = FunctionDescriptor.of(
-openssl_h.C_INT);
-
-static final MethodHandle MH = 
Linker.nativeLinker().downcallHandle(
-openssl_h.findOrThrow("ENGINE_register_all_complete"),
-DESC);
-}
-var mh$ = Holder.MH;
 try {
-return (int) mh$.invokeExact();
+return (int) 
Linker.nativeLinker().downcallHandle(openssl_h.findOrThrow("ENGINE_register_all_complete"),
+FunctionDescriptor.of(JAVA_INT)).invokeExact();
 } catch (Throwable ex$) {
throw new AssertionError("should not reach here", ex$);
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org