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
Next Next commit
Corrects style
  • Loading branch information
Piotr P. Karwasz committed Nov 10, 2019
commit 293d928fda43c1ed52e2bfbce4cb5ebd8e0e64db
43 changes: 26 additions & 17 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 @@ -22,8 +22,6 @@
import java.security.AccessController;
import java.security.PrivilegedAction;

import org.msgpack.core.MessagePack;

import sun.misc.Unsafe;

/**
Expand Down Expand Up @@ -104,7 +102,8 @@ enum DirectBufferConstructorType

if (MessageBuffer.javaVersion >= 8) {
setupCleanerJava9(direct);
} else {
}
else {
setupCleanerJava6(direct);
}
}
Expand All @@ -113,12 +112,15 @@ enum DirectBufferConstructorType
}
}

private static void setupCleanerJava6(final ByteBuffer direct) {
private static void setupCleanerJava6(final ByteBuffer direct)
{
Object obj;
obj = AccessController.doPrivileged(new PrivilegedAction<Object>() {
obj = AccessController.doPrivileged(new PrivilegedAction<Object>()
{

@Override
public Object run() {
public Object run()
{
return getCleanerMethod(direct);
}
});
Expand All @@ -128,10 +130,11 @@ public Object run() {
mCleaner = (Method) obj;
mCleaner.setAccessible(true);

obj = AccessController.doPrivileged(new PrivilegedAction<Object>() {

obj = AccessController.doPrivileged(new PrivilegedAction<Object>()
{
@Override
public Object run() {
public Object run()
{
return getCleanMethod(direct, mCleaner);
}
});
Expand All @@ -142,11 +145,13 @@ public Object run() {
mClean.setAccessible(true);
}

private static void setupCleanerJava9(final ByteBuffer direct) {
Object obj = AccessController.doPrivileged(new PrivilegedAction<Object>() {

private static void setupCleanerJava9(final ByteBuffer direct)
{
Object obj = AccessController.doPrivileged(new PrivilegedAction<Object>()
{
@Override
public Object run() {
public Object run()
{
return getInvokeCleanerMethod(direct);
}
});
Expand Down Expand Up @@ -217,11 +222,14 @@ private static Object getInvokeCleanerMethod(ByteBuffer direct)
"invokeCleaner", ByteBuffer.class);
m.invoke(MessageBuffer.unsafe, direct);
return m;
} catch (NoSuchMethodException e) {
}
catch (NoSuchMethodException e) {
return e;
} catch (InvocationTargetException e) {
}
catch (InvocationTargetException e) {
return e;
} catch (IllegalAccessException e) {
}
catch (IllegalAccessException e) {
return e;
}
}
Expand All @@ -245,7 +253,8 @@ static void clean(Object base)
if (MessageBuffer.javaVersion <= 8) {
Object cleaner = mCleaner.invoke(base);
mClean.invoke(cleaner);
} else {
}
else {
mInvokeCleaner.invoke(MessageBuffer.unsafe, base);
}
}
Expand Down