Skip to content

GH-35053: [Java] Fix MemoryUtil to support Java 21 #36370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lidavidm merged 1 commit into from
Jun 29, 2023
Merged

GH-35053: [Java] Fix MemoryUtil to support Java 21 #36370

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion java/memory/memory-core/src/main/java/org/apache/arrow/memory/util/MemoryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ public class MemoryUtil {
*/
public static final boolean LITTLE_ENDIAN = ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN;

// Java 1.8, 9, 11, 17, 21 becomes 1, 9, 11, 17, and 21.
private static final int majorVersion =
Integer.parseInt(System.getProperty("java.specification.version").split("\\D+")[0]);

static {
try {
// try to get the unsafe object
Expand Down Expand Up @@ -94,7 +98,8 @@ public Object run() {
@Override
public Object run() {
try {
final Constructor<?> constructor =
final Constructor<?> constructor = (majorVersion >= 21) ?
direct.getClass().getDeclaredConstructor(long.class, long.class) :
direct.getClass().getDeclaredConstructor(long.class, int.class);
constructor.setAccessible(true);
logger.debug("Constructor for direct buffer found and made accessible");
Expand Down