Checking the existence of a registry value throws an exception if the…

… key does not exist
java-native-access · Nov 16, 2018 · 15d6208 · dblock · Nov 18, 2018 · matthiasblaesing
1 parent 5f6fbe5
commit 15d6208
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -10,6 +10,7 @@ Features
 
 Bug Fixes
 ---------
+* [#1036](https://github.com/java-native-access/jna/issues/1036): `Advapi32Util.registryValueExists` called on non existig key raises exception instead of returning `false` - [@matthiasblaesing](https://github.com/matthiasblaesing).
 
 Release 5.1.0
 =============

diff --git a/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java b/contrib/platform/src/com/sun/jna/platform/win32/Advapi32Util.java
@@ -607,8 +607,7 @@ public static boolean registryKeyExists(HKEY root, String key, int samDesiredExt
 	 *            Value name.
 	 * @return True if the value exists.
 	 */
-	public static boolean registryValueExists(HKEY root, String key,
-											  String value) {
+	public static boolean registryValueExists(HKEY root, String key, String value) {
 		return registryValueExists(root, key, value, 0);
 	}
 
@@ -631,15 +630,15 @@ public static boolean registryValueExists(HKEY root, String key,
 		HKEYByReference phkKey = new HKEYByReference();
 		int rc = Advapi32.INSTANCE.RegOpenKeyEx(root, key, 0, WinNT.KEY_READ | samDesiredExtra,
 				phkKey);
+                switch (rc) {
+                case W32Errors.ERROR_SUCCESS:
+                        break;
+                case W32Errors.ERROR_FILE_NOT_FOUND:
+                        return false;
+                default:
+                        throw new Win32Exception(rc);
+                }
 		try {
-			switch (rc) {
-			case W32Errors.ERROR_SUCCESS:
-				break;
-			case W32Errors.ERROR_FILE_NOT_FOUND:
-				return false;
-			default:
-				throw new Win32Exception(rc);
-			}
 			IntByReference lpcbData = new IntByReference();
 			IntByReference lpType = new IntByReference();
 			rc = Advapi32.INSTANCE.RegQueryValueEx(phkKey.getValue(), value, 0,

diff --git a/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java b/contrib/platform/test/com/sun/jna/platform/win32/Advapi32UtilTest.java
@@ -245,6 +245,7 @@ public void testRegistryValueExists() {
                                                      "Software\\Microsoft", "KeyDoesNotExist"));
         assertTrue(Advapi32Util.registryValueExists(WinReg.HKEY_LOCAL_MACHINE,
                                                     "SYSTEM\\CurrentControlSet\\Control", "SystemBootDevice"));
+        assertFalse(Advapi32Util.registryValueExists(WinReg.HKEY_CURRENT_USER, "FAIL", "Path"));
     }
 
     public void testRegistryValueExistsSamExtra() {