jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java
--- a/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java Fri Feb 10 00:39:51 2017 -0800
+++ b/jaxws/src/java.xml.ws/share/classes/com/sun/xml/internal/ws/client/sei/MethodUtil.java Thu Feb 16 13:14:39 2017 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 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
@@ -31,7 +31,7 @@
import java.util.logging.Logger;
/**
- * Utility class to invoke sun.reflect.misc.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
+ * Utility class to invoke com.sun.xml.internal.ws.util.MethodUtil.invoke() if available. If not (other then Oracle JDK) fallbacks
* to java.lang,reflect.Method.invoke()
* <p/>
* Be careful, copy of this class exists in several packages, iny modification must be done to other copies too!
@@ -39,43 +39,17 @@
class MethodUtil {
private static final Logger LOGGER = Logger.getLogger(MethodUtil.class.getName());
- private static final Method INVOKE_METHOD;
-
- static {
- Method method;
- try {
- Class<?> clazz = Class.forName("sun.reflect.misc.MethodUtil");
- method = clazz.getMethod("invoke", Method.class, Object.class, Object[].class);
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil found; it will be used to invoke methods.");
- }
- } catch (Throwable t) {
- method = null;
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.log(Level.FINE, "Class sun.reflect.misc.MethodUtil not found, probably non-Oracle JVM");
- }
- }
- INVOKE_METHOD = method;
- }
static Object invoke(Object target, Method method, Object[] args) throws IllegalAccessException, InvocationTargetException {
- if (INVOKE_METHOD != null) {
- // sun.reflect.misc.MethodUtil.invoke(method, owner, args)
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.log(Level.FINE, "Invoking method using sun.reflect.misc.MethodUtil");
- }
- try {
- return INVOKE_METHOD.invoke(null, method, target, args);
- } catch (InvocationTargetException ite) {
- // unwrap invocation exception added by reflection code ...
- throw unwrapException(ite);
- }
- } else {
- // other then Oracle JDK ...
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.log(Level.FINE, "Invoking method directly, probably non-Oracle JVM");
- }
- return method.invoke(target, args);
+ // com.sun.xml.internal.ws.util.MethodUtil.invoke(method, owner, args)
+ if (LOGGER.isLoggable(Level.FINE)) {
+ LOGGER.log(Level.FINE, "Invoking method using com.sun.xml.internal.ws.util.MethodUtil");
+ }
+ try {
+ return com.sun.xml.internal.ws.util.MethodUtil.invoke(method, target, args);
+ } catch (InvocationTargetException ite) {
+ // unwrap invocation exception added by reflection code ...
+ throw unwrapException(ite);
}
}