modules/javafx.fxml/src/main/java/com/sun/javafx/fxml/ModuleHelper.java

rev 10441 : imported patch fix-8177566-trampoline

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.  Oracle designates this

@@ -28,11 +28,10 @@
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
-import sun.reflect.misc.MethodUtil;
 
 public class ModuleHelper {
     private static final Method getModuleMethod;
     private static final Method getResourceAsStreamMethod;
 

@@ -94,11 +93,11 @@
             System.out.println("thisModule = " + thisModule);
             System.out.println("methodModule = " + methodModule);
             System.out.println("m = " + m);
         }
         if (methodModule != thisModule) {
-            return MethodUtil.invoke(m, obj, params);
+            return MethodHelper.invoke(m, obj, params);
         } else {
             return m.invoke(obj, params);
         }
     }
 }