stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Lana Steuck 2014-07-18 08:25:26 -07:00
commit 9ca73376d6
8 changed files with 152 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jaxws/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,22 +40,32 @@ import java.util.logging.Logger;
* Utils class. * Utils class.
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,22 +40,32 @@ import java.util.logging.Logger;
* Utils class. * Utils class.
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,22 +40,32 @@ import java.util.logging.Logger;
* Utils class. * Utils class.
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,22 +40,32 @@ import java.util.logging.Logger;
* Utils class. * Utils class.
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,22 +40,32 @@ import java.util.logging.Logger;
* Utils class. * Utils class.
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -38,22 +40,32 @@ import java.util.logging.Logger;
* Utils class. * Utils class.
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -41,22 +43,32 @@ import java.util.logging.Logger;
* *
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {

26
jaxws/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/db/Utils.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -31,6 +31,8 @@ import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
@ -41,22 +43,32 @@ import java.util.logging.Logger;
* *
* Has *package private* access to avoid inappropriate usage. * Has *package private* access to avoid inappropriate usage.
*/ */
/* package */ final class Utils { final class Utils {
private static final Logger LOGGER = Logger.getLogger(Utils.class.getName()); private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
/** /**
* static ReflectionNavigator field to avoid usage of reflection every time we use it. * static ReflectionNavigator field to avoid usage of reflection every time we use it.
*/ */
/* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR; static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
static { // we statically initializing REFLECTION_NAVIGATOR property static { // we statically initializing REFLECTION_NAVIGATOR property
Class refNav = null;
try { try {
refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
//noinspection unchecked //noinspection unchecked
Method getInstance = refNav.getDeclaredMethod("getInstance"); final Method getInstance = refNav.getDeclaredMethod("getInstance");
getInstance.setAccessible(true);
// requires accessClassInPackage privilege
AccessController.doPrivileged(
new PrivilegedAction<Object>() {
@Override
public Object run() {
getInstance.setAccessible(true);
return null;
}
}
);
//noinspection unchecked //noinspection unchecked
REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {