From 6731538bbe18a56f827a73bf14b221454d75afc2 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Tue, 19 Mar 2024 10:09:18 -0700
Subject: [PATCH] Different string allocation on jdk 21/22 (#106492)

Similar to https://github.com/elastic/elasticsearch/pull/106360, the
methods for allocating a native string changed between Java 21 and 22.
This commit adds another util method to handle the differences and uses
it in the jdk systemd impl.
---
 .../elasticsearch/nativeaccess/jdk/JdkSystemdLibrary.java    | 2 +-
 .../elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java    | 5 +++++
 .../elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/JdkSystemdLibrary.java b/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/JdkSystemdLibrary.java
index 745b93ac918d..5313984ac6d6 100644
--- a/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/JdkSystemdLibrary.java
+++ b/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/JdkSystemdLibrary.java
@@ -58,7 +58,7 @@ class JdkSystemdLibrary implements SystemdLibrary {
     @Override
     public int sd_notify(int unset_environment, String state) {
         try (Arena arena = Arena.ofConfined()) {
-            MemorySegment nativeState = arena.allocateUtf8String(state);
+            MemorySegment nativeState = MemorySegmentUtil.allocateString(arena, state);
             return (int) sd_notify$mh.invokeExact(unset_environment, nativeState);
         } catch (Throwable t) {
             throw new AssertionError(t);
diff --git a/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java b/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java
index 53e4c06bf043..6ac0243c3bef 100644
--- a/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java
+++ b/libs/native/src/main21/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.nativeaccess.jdk;
 
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
 /**
@@ -19,5 +20,9 @@ class MemorySegmentUtil {
         return segment.getUtf8String(offset);
     }
 
+    static MemorySegment allocateString(Arena arena, String s) {
+        return arena.allocateUtf8String(s);
+    }
+
     private MemorySegmentUtil() {}
 }
diff --git a/libs/native/src/main22/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java b/libs/native/src/main22/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java
index c155647a3ccd..59bb57d17400 100644
--- a/libs/native/src/main22/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java
+++ b/libs/native/src/main22/java/org/elasticsearch/nativeaccess/jdk/MemorySegmentUtil.java
@@ -8,6 +8,7 @@
 
 package org.elasticsearch.nativeaccess.jdk;
 
+import java.lang.foreign.Arena;
 import java.lang.foreign.MemorySegment;
 
 public class MemorySegmentUtil {
@@ -16,5 +17,9 @@ public class MemorySegmentUtil {
         return segment.getString(offset);
     }
 
+    static MemorySegment allocateString(Arena arena, String s) {
+        return arena.allocateFrom(s);
+    }
+
     private MemorySegmentUtil() {}
 }