Changeset 13466 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2018-02-26T19:32:16+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15992 - fix NPE

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -704 +704 @@
             // Great, but our WinRegistry only handles REG_SZ type, so we have to check the Version key
             String version = WinRegistry.readString(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", "Version");
-            Matcher m = Pattern.compile("(\\d+)\\.(\\d+)(\\.\\d+.*)?").matcher(version);
-            if (m.matches()) {
-                int maj = Integer.valueOf(m.group(1));
-                int min = Integer.valueOf(m.group(2));
-                return (maj == 4 && min >= 5) || maj > 4;
+            if (version != null) {
+                Matcher m = Pattern.compile("(\\d+)\\.(\\d+)(\\.\\d+.*)?").matcher(version);
+                if (m.matches()) {
+                    int maj = Integer.valueOf(m.group(1));
+                    int min = Integer.valueOf(m.group(2));
+                    return (maj == 4 && min >= 5) || maj > 4;
+                }
             }
         } catch (IllegalAccessException | InvocationTargetException | NumberFormatException e) {