Changeset 12697 in josm for trunk/src/org

Timestamp:

2017-08-30T11:46:11+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15207 - NPE at PlatformHookOsx.invoke when opening preferences (regression from r12695)

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java (modified) (2 diffs)

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

@@ -29 +29 @@
 public class PlatformHookOsx implements PlatformHook, InvocationHandler {
 
-    private static final PlatformHookOsx INVOCATION_HANDLER = new PlatformHookOsx();
-
     private String oSBuildNumber;
 
@@ -59 +57 @@
             Class<?> preferencesHandler = findHandlerClass("PreferencesHandler");
             Object proxy = Proxy.newProxyInstance(PlatformHookOsx.class.getClassLoader(), new Class<?>[] {
-                quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, INVOCATION_HANDLER);
+                quitHandler, aboutHandler, openFilesHandler, preferencesHandler}, this);
             Object appli = eawtApplication.getConstructor((Class[]) null).newInstance((Object[]) null);
             if (Utils.getJavaVersion() >= 9) {