modules/javafx.web/src/main/java/com/sun/webkit/Utilities.java

rev 10441 : imported patch fix-8177566-trampoline

*** 1,7 ****
  /*
!  * Copyright (c) 2011, 2014, 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
--- 1,7 ----
  /*
!  * Copyright (c) 2011, 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
*** 31,41 ****
  import java.security.AccessController;
  import java.security.PrivilegedActionException;
  import java.security.PrivilegedExceptionAction;
  import java.util.HashMap;
  import java.util.Map;
- import sun.reflect.misc.MethodUtil;
  
  public abstract class Utilities {
  
      private static Utilities instance;
  
--- 31,40 ----
*** 89,99 ****
                                                 final Object instance,
                                                 final Object[] args,
                                                 AccessControlContext acc)
      throws Throwable {
          try {
!             return AccessController.doPrivileged((PrivilegedExceptionAction<Object>) () -> MethodUtil.invoke(method, instance, args), acc);
          } catch (PrivilegedActionException ex) {
              Throwable cause = ex.getCause();
              if (cause == null)
                  cause = ex;
              else if (cause instanceof InvocationTargetException
--- 88,99 ----
                                                 final Object instance,
                                                 final Object[] args,
                                                 AccessControlContext acc)
      throws Throwable {
          try {
!             return AccessController.doPrivileged((PrivilegedExceptionAction<Object>)
!                     () -> MethodHelper.invoke(method, instance, args), acc);
          } catch (PrivilegedActionException ex) {
              Throwable cause = ex.getCause();
              if (cause == null)
                  cause = ex;
              else if (cause instanceof InvocationTargetException
*** 101,106 ****
                  cause = cause.getCause();
              throw cause;
          }
      }
  }
- 
--- 101,105 ----