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 a903a28dd1 Simplify code for allocation of blank arrays a903a28dd1 is described below commit a903a28dd14055b6537a33904baef875b68678d8 Author: remm <r...@apache.org> AuthorDate: Thu Jul 20 16:07:36 2023 +0200 Simplify code for allocation of blank arrays --- .../org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java | 8 ++++---- .../org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java index c95ae98595..5030c04bb7 100644 --- a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java +++ b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java @@ -223,7 +223,7 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { long errCode = ERR_get_error(); if (errCode != 0) { try (var localArena = Arena.ofConfined()) { - var buf = localArena.allocateFrom(ValueLayout.JAVA_BYTE, new byte[128]); + var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 128); ERR_error_string(errCode, buf); log.error(sm.getString("openssl.errorLoadingCertificate", buf.getString(0))); } @@ -409,7 +409,7 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { rc = 1; long errCode = ERR_get_error(); if (errCode != 0) { - var buf = localArena.allocateFrom(ValueLayout.JAVA_BYTE, new byte[128]); + var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 128); ERR_error_string(errCode, buf); log.error(sm.getString("opensslconf.checkFailed", buf.getString(0))); rc = 0; @@ -485,7 +485,7 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { localArena.allocateFrom(value)); long errCode = ERR_get_error(); if (rc <= 0 || errCode != 0) { - var buf = localArena.allocateFrom(ValueLayout.JAVA_BYTE, new byte[128]); + var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 128); ERR_error_string(errCode, buf); log.error(sm.getString("opensslconf.commandError", name, value, buf.getString(0))); rc = 0; @@ -1309,7 +1309,7 @@ public class OpenSSLContext implements org.apache.tomcat.util.net.SSLContext { private static void logLastError(SegmentAllocator allocator, String string) { - var buf = allocator.allocateFrom(ValueLayout.JAVA_BYTE, new byte[128]); + var buf = allocator.allocate(ValueLayout.JAVA_BYTE, 128); ERR_error_string(ERR_get_error(), buf); String err = buf.getString(0); log.error(sm.getString(string, err)); diff --git a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java index a3b6ce301d..e64dee7409 100644 --- a/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java +++ b/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java @@ -1046,7 +1046,7 @@ public final class OpenSSLEngine extends SSLEngine implements SSLUtil.ProtocolIn try (var localArena = Arena.ofConfined()) { do { // Loop until getLastErrorNumber() returns SSL_ERROR_NONE - var buf = localArena.allocateFrom(ValueLayout.JAVA_BYTE, new byte[128]); + var buf = localArena.allocate(ValueLayout.JAVA_BYTE, 128); ERR_error_string(error, buf); String err = buf.getString(0); if (sslError == null) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org