Merge pull request java-native-access#1234 from joerg1985/variant

Minor improvements to code related to Variants
matthiasblaesing · Jul 20, 2020 · b8443b8 · b8443b8
2 parents 083a2fe + 70035ce
commit b8443b8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/util/Convert.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/util/Convert.java
@@ -144,9 +144,9 @@ public static VARIANT toVariant(Object value) {
     }
 
     public static Object toJavaObject(VARIANT value, Class<?> targetClass, ObjectFactory factory, boolean addReference, boolean freeValue) {
-        if (null == value
-                || value.getVarType().intValue() == VT_EMPTY
-                || value.getVarType().intValue() == VT_NULL) {
+        int varType = (value != null) ? value.getVarType().intValue() : VT_NULL;
+
+        if (varType == VT_EMPTY || varType == VT_NULL) {
             return null;
         }
 
@@ -163,8 +163,9 @@ public static Object toJavaObject(VARIANT value, Class<?> targetClass, ObjectFac
 
         VARIANT inputValue = value;
 
-        if (value.getVarType().intValue() == (VT_BYREF | VT_VARIANT)) {
+        if (varType == (VT_BYREF | VT_VARIANT)) {
             value = (VARIANT) value.getValue();
+            varType = value.getVarType().intValue();
         }
 
         // Passing null or Object.class as targetClass switch to default
@@ -173,9 +174,7 @@ public static Object toJavaObject(VARIANT value, Class<?> targetClass, ObjectFac
 
             targetClass = null;
 
-            int varType = value.getVarType().intValue();
-
-            switch (value.getVarType().intValue()) {
+            switch (varType) {
                 case VT_UI1:
                 case VT_I1:
                     targetClass = Byte.class;

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/COM/util/ProxyObject.java b/contrib/platform/src/com/sun/jna/platform/win32/COM/util/ProxyObject.java
@@ -387,7 +387,6 @@ private void setProperty(DISPID dispID, Object... args) {
         for (int i = 0; i < vargs.length; ++i) {
             vargs[i] = Convert.toVariant(args[i]);
         }
-        Variant.VARIANT.ByReference result = new Variant.VARIANT.ByReference();
         WinNT.HRESULT hr = this.oleMethod(OleAuto.DISPATCH_PROPERTYPUT, null, this.getRawDispatch(), dispID, vargs);
 
         for (int i = 0; i < vargs.length; i++) {