Restore JDK6 compatibility for jna-platform

java-native-access · Aug 8, 2023 · d3093f9 · d3093f9
1 parent e96f301
commit d3093f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/DBT.java b/contrib/platform/src/com/sun/jna/platform/win32/DBT.java
@@ -32,7 +32,7 @@
 import com.sun.jna.platform.win32.WinNT.HANDLE;
 import com.sun.jna.platform.win32.WinUser.HDEVNOTIFY;
 import com.sun.jna.win32.W32APITypeMapper;
-import java.nio.charset.StandardCharsets;
+import java.io.UnsupportedEncodingException;
 import java.util.logging.Logger;
 
 /**
@@ -326,7 +326,13 @@ public String getDbcpName() {
             if(W32APITypeMapper.DEFAULT == W32APITypeMapper.ASCII) {
                 return Native.toString(this.dbcp_name);
             } else {
-                return new String(this.dbcp_name, StandardCharsets.UTF_16LE);
+                try {
+                    return new String(this.dbcp_name, "UTF-16LE");
+                } catch (UnsupportedEncodingException ex) {
+                    // UTF-16LE is documented to be present at least beginning
+                    // with JDK 6
+                    throw new RuntimeException(ex);
+                }
             }
         }
     }

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Kernel32Util.java
@@ -954,7 +954,7 @@ public static final String QueryFullProcessImageName(int pid, int dwFlags) {
                 if (we == null) {
                     we = e;
                 } else {
-                    we.addSuppressed(e);
+                    we.addSuppressedReflected(e);
                 }
             }
             if (we != null) {