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

Timestamp:

2018-03-03T18:18:36+01:00 (7 years ago)

Author:

Don-vip

Message:

see #15992 - do not log PS 2.0 errors as such (debug level is enough)

File:

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

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

@@ -728 +728 @@
             return Integer.parseInt(Utils.execOutput(Arrays.asList(
                     "powershell", "-Command", "$PSVersionTable.PSVersion.Major"), 2, TimeUnit.SECONDS));
-        } catch (NumberFormatException | IOException | ExecutionException | InterruptedException e) {
+        } catch (ExecutionException e) {
+            // PowerShell 2.0 (included in Windows 7) does not even support this
+            Logging.debug(e);
+            return -1;
+        } catch (NumberFormatException | IOException | InterruptedException e) {
             Logging.error(e);
             return -1;