Skip to content

Improves MessageBuffer support for Java 11 #514

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
xerial merged 9 commits into from
Nov 18, 2019
Merged

Improves MessageBuffer support for Java 11 #514

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
40fea89
Improves MessageBuffer support of Java 11
Sep 13, 2019
89d6964
Corrects code style
Sep 13, 2019
77a76a2
Do not switch to MessageBufferU on Java 9+
Nov 8, 2019
f3b14bb
Run Java 11 tests on universal buffer only
Nov 8, 2019
55d8dd3
Fixes DirectBufferAccess#clean on Java 11
Nov 10, 2019
293d928
Corrects style
Nov 10, 2019
42ef575
Corrects whitespace
Nov 10, 2019
bd2e6f9
Restores Java8 tests.
Nov 10, 2019
2860e9c
Fixes IllegalAccessExceptions
Nov 10, 2019
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
Prev Previous commit
Fixes IllegalAccessExceptions 
Adds missing setAccessible calls.
  • Loading branch information
Piotr P. Karwasz committed Nov 10, 2019
commit 2860e9c6b55f5d5232e5d2cac9b57ade7af67f4d
10 changes: 5 additions & 5 deletions msgpack-core/src/main/java/org/msgpack/core/buffer/DirectBufferAccess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ enum DirectBufferConstructorType
mGetAddress = directByteBufferClass.getDeclaredMethod("address");
mGetAddress.setAccessible(true);

if (MessageBuffer.javaVersion >= 9) {
setupCleanerJava9(direct);
if (MessageBuffer.javaVersion <= 8) {
setupCleanerJava6(direct);
}
else {
setupCleanerJava6(direct);
setupCleanerJava9(direct);
}
}
catch (Exception e) {
Expand All @@ -127,7 +127,6 @@ public Object run()
throw new RuntimeException((Throwable) obj);
}
mCleaner = (Method) obj;
mCleaner.setAccessible(true);

obj = AccessController.doPrivileged(new PrivilegedAction<Object>()
{
Expand All @@ -141,7 +140,6 @@ public Object run()
throw new RuntimeException((Throwable) obj);
}
mClean = (Method) obj;
mClean.setAccessible(true);
}

private static void setupCleanerJava9(final ByteBuffer direct)
Expand Down Expand Up @@ -169,6 +167,7 @@ private static Object getCleanerMethod(ByteBuffer direct)
{
try {
Method m = direct.getClass().getDeclaredMethod("cleaner");
m.setAccessible(true);
m.invoke(direct);
return m;
}
Expand All @@ -194,6 +193,7 @@ private static Object getCleanMethod(ByteBuffer direct, Method mCleaner)
try {
Method m = mCleaner.getReturnType().getDeclaredMethod("clean");
Object c = mCleaner.invoke(direct);
m.setAccessible(true);
m.invoke(c);
return m;
}
Expand Down