Simplify code for allocation of blank arrays

apache · Jul 20, 2023 · a903a28 · a903a28
1 parent 5f2bf30
commit a903a28
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...enssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java b/...enssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -223,7 +223,7 @@ public OpenSSLContext(SSLHostConfigCertificate certificate, List<String> negotia
                     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 @@ private boolean checkConf(OpenSSLConf conf) throws Exception {
                     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 @@ private boolean applyConf(OpenSSLConf conf) throws Exception {
                             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 @@ private static X509Certificate[] certificates(byte[][] chain) {
 
 
     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/...penssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java b/...penssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -1046,7 +1046,7 @@ private String getLastError() {
             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) {