Skip to content
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

Java 6 compatibility #876

Merged
merged 2 commits into from
Nov 22, 2017
Merged

Java 6 compatibility #876

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cdf45f
Fix ELFAnalyserTest for java 6 (remove usage of post-java6 NIO code)
matthiasblaesing Nov 18, 2017
e240a2d
Replace addSuppressed with a reflection based variant
matthiasblaesing Nov 18, 2017
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Bug Fixes
* [#863](https://github.com/java-native-access/jna/pull/863): Fix ARM softfloat/hardfloat detection by modifying armSoftFloat condition in ELFAnalyser. Before this fix a softfloat binary could be misdetected as hardfloat. - [@kunkun26](https://github.com/kunkun26).
* [#867](https://github.com/java-native-access/jna/issues/867): Fix memory leak in `COMLateBindingObject#getStringProperty` - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#871](https://github.com/java-native-access/jna/issues/871): Fix mapping of libc function `gethostname`, `sethostname`, `getdomainname` and `setdomainname` and bind `com.sun.jna.platform.win32.Winsock2.gethostname(byte[], int)` - [@matthiasblaesing](https://github.com/matthiasblaesing).
* [#876](https://github.com/java-native-access/jna/pull/876): Restore java 6 compatibility - [@matthiasblaesing](https://github.com/matthiasblaesing).

Breaking Changes
----------------
Expand Down
4 changes: 2 additions & 2 deletions contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ public static Account[] getCurrentUserGroups() {
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}
}
Expand Down Expand Up @@ -2443,7 +2443,7 @@ public static boolean accessCheck(File file, AccessCheckPermission permissionToC
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}

Expand Down
4 changes: 2 additions & 2 deletions contrib/platform/src/com/sun/jna/platform/win32/Crypt32Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ public static byte[] cryptUnprotectData(byte[] data, byte[] entropy, int flags,
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}
}
Expand All @@ -162,7 +162,7 @@ public static byte[] cryptUnprotectData(byte[] data, byte[] entropy, int flags,
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions contrib/platform/src/com/sun/jna/platform/win32/GDI32Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public static BufferedImage getScreenshot(HWND target) {
if (result == null || WinGDI.HGDI_ERROR.equals(result)) {
Win32Exception ex = new Win32Exception(Native.getLastError());
if (we != null) {
ex.addSuppressed(we);
ex.addSuppressedReflected(we);
}
we = ex;
}
Expand All @@ -163,7 +163,7 @@ public static BufferedImage getScreenshot(HWND target) {
if (!GDI32.INSTANCE.DeleteObject(hBitmap)) {
Win32Exception ex = new Win32Exception(Native.getLastError());
if (we != null) {
ex.addSuppressed(we);
ex.addSuppressedReflected(we);
}
we = ex;
}
Expand All @@ -174,7 +174,7 @@ public static BufferedImage getScreenshot(HWND target) {
if (!GDI32.INSTANCE.DeleteDC(hdcTargetMem)) {
Win32Exception ex = new Win32Exception(Native.getLastError());
if (we != null) {
ex.addSuppressed(we);
ex.addSuppressedReflected(we);
}
we = ex;
}
Expand Down
12 changes: 6 additions & 6 deletions contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public static void closeHandleRefs(HANDLEByReference... refs) {
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}
}
Expand Down Expand Up @@ -148,7 +148,7 @@ public static void closeHandles(HANDLE... handles) {
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}
}
Expand Down Expand Up @@ -341,7 +341,7 @@ public static int getFileType(String fileName) throws FileNotFoundException {
if (err == null) {
err = e;
} else {
err.addSuppressed(e);
err.addSuppressedReflected(e);
}
}

Expand Down Expand Up @@ -905,7 +905,7 @@ public static byte[] getResource(String path, String type, String name) {
if (!Kernel32.INSTANCE.FreeLibrary(target)) {
Win32Exception we = new Win32Exception(Kernel32.INSTANCE.GetLastError());
if (err != null) {
we.addSuppressed(err);
we.addSuppressedReflected(err);
}
throw we;
}
Expand Down Expand Up @@ -1013,7 +1013,7 @@ public boolean invoke(HMODULE module, Pointer type, Pointer name, Pointer lParam
if (!Kernel32.INSTANCE.FreeLibrary(target)) {
Win32Exception we = new Win32Exception(Kernel32.INSTANCE.GetLastError());
if (err != null) {
we.addSuppressed(err);
we.addSuppressedReflected(err);
}
throw we;
}
Expand Down Expand Up @@ -1075,7 +1075,7 @@ public static List<Tlhelp32.MODULEENTRY32W> getModules(int processID) {
if (we == null) {
we = e;
} else {
we.addSuppressed(e);
we.addSuppressedReflected(e);
}
}

Expand Down
31 changes: 31 additions & 0 deletions contrib/platform/src/com/sun/jna/platform/win32/Win32Exception.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@

import com.sun.jna.LastErrorException;
import com.sun.jna.platform.win32.WinNT.HRESULT;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* Win32 exception.
Expand Down Expand Up @@ -69,4 +73,31 @@ protected Win32Exception(int code, HRESULT hr, String msg) {
super(code, msg);
_hr = hr;
}

private static Method addSuppressedMethod = null;
static {
try {
addSuppressedMethod = Throwable.class.getMethod("addSuppressed", Throwable.class);
} catch (NoSuchMethodException ex) {
// This is the case for JDK < 7
} catch (SecurityException ex) {
Logger.getLogger(Win32Exception.class.getName()).log(Level.SEVERE, "Failed to initialize 'addSuppressed' method", ex);
}
}

void addSuppressedReflected(Throwable exception) {
if(addSuppressedMethod == null) {
// Make this a NOOP on an unsupported JDK
return;
}
try {
addSuppressedMethod.invoke(this, exception);
} catch (IllegalAccessException ex) {
throw new RuntimeException("Failed to call addSuppressedMethod", ex);
} catch (IllegalArgumentException ex) {
throw new RuntimeException("Failed to call addSuppressedMethod", ex);
} catch (InvocationTargetException ex) {
throw new RuntimeException("Failed to call addSuppressedMethod", ex);
}
}
}
2 changes: 1 addition & 1 deletion contrib/platform/src/com/sun/jna/platform/win32/WininetUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public static Map<String, String> getCache() {
if (!Wininet.INSTANCE.FindCloseUrlCache(cacheHandle)) {
if (we != null) {
Win32Exception e = new Win32Exception(Native.getLastError());
e.addSuppressed(we);
e.addSuppressedReflected(we);
we = e;
}
}
Expand Down
2 changes: 1 addition & 1 deletion contrib/platform/src/com/sun/jna/platform/win32/WinspoolUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public static PRINTER_INFO_2 getPrinterInfo2(String printerName) {
if (!Winspool.INSTANCE.ClosePrinter(pHandle.getValue())) {
Win32Exception ex = new Win32Exception(Kernel32.INSTANCE.GetLastError());
if (we != null) {
ex.addSuppressed(we);
ex.addSuppressedReflected(we);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions contrib/platform/test/com/sun/jna/platform/win32/Kernel32Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1552,7 +1552,7 @@ public void testModule32FirstW() {
if (we == null) {
we = e;
} else {
we.addSuppressed(e);
we.addSuppressedReflected(e);
}
}

Expand Down Expand Up @@ -1589,7 +1589,7 @@ public void testModule32NextW() {
if (we == null) {
we = e;
} else {
we.addSuppressed(e);
we.addSuppressedReflected(e);
}
}

Expand Down
6 changes: 3 additions & 3 deletions contrib/platform/test/com/sun/jna/platform/win32/PsapiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void testEnumProcessModules() {
if (we == null) {
we = e;
} else {
we.addSuppressed(e);
we.addSuppressedReflected(e);
}
}
if (we != null) {
Expand Down Expand Up @@ -186,7 +186,7 @@ public void testGetModuleInformation() {
if (we == null) {
we = e;
} else {
we.addSuppressed(e);
we.addSuppressedReflected(e);
}
}
if (we != null) {
Expand Down Expand Up @@ -218,7 +218,7 @@ public void testGetProcessImageFileName() {
if (we == null) {
we = e;
} else {
we.addSuppressed(e);
we.addSuppressedReflected(e);
}
}
if (we != null) {
Expand Down
20 changes: 20 additions & 0 deletions contrib/platform/test/com/sun/jna/platform/win32/Win32ExceptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import com.sun.jna.LastErrorException;

import junit.framework.TestCase;
import org.junit.Assume;

/**
* @author dblock[at]dblock[dot]org
Expand Down Expand Up @@ -50,8 +51,27 @@ public void testFormatMessageFromHR() {
}
}

public void testAddSuppressed() {
Assume.assumeTrue(isMethodPresent(Win32Exception.class, "addSuppressed", Throwable.class));

Win32Exception demoException = new Win32Exception(WinError.E_FAIL);
demoException.addSuppressed(new RuntimeException("Demo"));

assertEquals(1, demoException.getSuppressed().length);
assertEquals("Demo", demoException.getSuppressed()[0].getMessage());
}

private void assertLastErrorValue(LastErrorException e, int code, String msg) {
assertEquals("Mismatched error code", code, e.getErrorCode());
assertEquals("Mismatched error message", msg, e.getMessage());
}

private boolean isMethodPresent(Class<?> baseClass, String methodName, Class... parameters) throws SecurityException {
try {
baseClass.getMethod(methodName, parameters);
return true;
} catch (NoSuchMethodException ex) {
return false;
}
}
}
Loading