Encoding could/should be final

java-native-access · Nov 8, 2023 · 20cbd56 · 20cbd56
1 parent a4aca64
commit 20cbd56
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/com/sun/jna/NativeLibrary.java b/src/com/sun/jna/NativeLibrary.java
@@ -102,7 +102,7 @@ public long getSymbolAddress(long handle, String name, SymbolProvider parent) {
     private final Map<String, Function> functions = new HashMap<String, Function>();
     private final SymbolProvider symbolProvider;
     final int callFlags;
-    private String encoding;
+    private final String encoding;
     final Map<String, ?> options;
 
     private static final Map<String, Reference<NativeLibrary>> libraries = new HashMap<String, Reference<NativeLibrary>>();
@@ -129,18 +129,19 @@ private NativeLibrary(String libraryName, String libraryPath, long handle, Map<S
         int callingConvention = option instanceof Number ? ((Number)option).intValue() : Function.C_CONVENTION;
         this.callFlags = callingConvention;
         this.options = options;
-        this.encoding = (String)options.get(Library.OPTION_STRING_ENCODING);
+        String optionEncoding = (String)options.get(Library.OPTION_STRING_ENCODING);
+        if (optionEncoding == null) {
+            this.encoding = Native.getDefaultStringEncoding();
+        } else {
+            this.encoding = optionEncoding;
+        }
         SymbolProvider optionSymbolProvider = (SymbolProvider)options.get(Library.OPTION_SYMBOL_PROVIDER);
         if (optionSymbolProvider == null) {
             this.symbolProvider = NATIVE_SYMBOL_PROVIDER;
         } else {
             this.symbolProvider = optionSymbolProvider;
         }
 
-        if (this.encoding == null) {
-            this.encoding = Native.getDefaultStringEncoding();
-        }
-
         // Special workaround for w32 kernel32.GetLastError
         // Short-circuit the function to use built-in GetLastError access
         if (Platform.isWindows() && "kernel32".equals(this.libraryName.toLowerCase())) {