Mercurial > hg > icedtea7-forest > jaxws
changeset 1188:5ee59be2092b icedtea-2.6pre18
Merge jdk7u80-b05
author | andrew |
---|---|
date | Thu, 29 Jan 2015 22:20:22 +0000 |
parents | 592f7adb2016 (current diff) 9f2cfb819e13 (diff) |
children | 26c7686a4f96 |
files | .hgtags src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java |
diffstat | 10 files changed, 159 insertions(+), 132 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 22 02:55:36 2015 +0000 +++ b/.hgtags Thu Jan 29 22:20:22 2015 +0000 @@ -492,11 +492,19 @@ dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18 db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19 0cd66509e11335fac490076cbdcb2f47c592de86 jdk7u65-b32 +bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00 +0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01 +579128925dd9a0e9c529125c9e299dc0518037a5 jdk7u80-b02 28d868d40df0d420b87698e1215e5039d24a8ae5 jdk7u65-b20 1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01 db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b40 190d885fe83b5b1801ee6d7327161254545d55a8 jdk7u65-b31 6cf7676aa11c053481c0806afda9fc91c2bfd782 jdk7u65-b33 +1ef1681e21ca00edbc8727e849fef50637cc52d8 jdk7u67-b01 +34e3554140b7f9efe2ad20fa04dfd5faf5821248 jdk7u67-b31 +6090119e680a65addafb82f2b6227315813b7e68 jdk7u67-b32 +aa1879afbb8dc4dd157eab31c86de2845a3cad6a jdk7u67-b33 +a3290ceed5750bfc62a5ec5c00ee1aea125e9db3 jdk7u67-b34 d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u66-b00 1dce52b208a9528266c26352e03e67ec0ddb4dd7 jdk7u66-b01 04481967eff566b8a379a0315d2a3a255928d6ce jdk7u66-b09 @@ -538,6 +546,39 @@ d4be88d9bfbff3e41bc4121838e90160734d9805 jdk7u72-b13 e33bca6f8dab3e82b2dec2c52074f19a88e1267e jdk7u72-b14 587c4a3bfb76c03fa589f61e28ed739c537409bc jdk7u72-b30 +4257d52e30b4054c9ce43cfe830dff2b8f740037 jdk7u72-b31 +664724762a245f1cd9d89ccd3d3833fcb16bed80 jdk7u75-b00 +ce5b9e0d988cb52d9e6c36edeafe60bd16280534 jdk7u75-b01 +1b6ba791cbf7d995a81dfd1478906ebae3769ea2 jdk7u75-b02 +033349ac9e45fd897571ff4f6e38ed48d46cd539 jdk7u75-b03 +f1266833b5a07aa84d5da263f4a18503838286f4 jdk7u75-b04 +bfe594779717071439b94ddc771117eedb442a25 jdk7u75-b05 +b700cddd5754a82fca4f5465116fbba516a96667 jdk7u75-b06 +781d7a0230eef7cbef89bb32bc0d722730c198e3 jdk7u75-b07 +b85627d6afbb758fc244147dfdbbd287ee524eed jdk7u75-b08 +e7aef72db8cf95b27af7c2508a02bf87b52b325b jdk7u75-b09 +d7c340b9d530da158dce7da897f66e31e83b1366 jdk7u75-b10 +4b36c07b29c32064abdfa6df09c381861875ddd4 jdk7u75-b11 +5458349b0e4860662dc5a4f96363c0e714d09c65 jdk7u75-b12 +38d474b401c6a69dfc7cea5ba79a894980fa8107 jdk7u75-b13 +4d068ffb0b544d004792b3047c5aa9ab72b53529 jdk7u75-b30 +2232599a19acc7c45baa0b3c70f072a47f1cbc22 jdk7u75-b31 +5d60eecdd6b881856ddfc34e0d34f3072575662a jdk7u76-b00 +9fed28dcccaafd49f9a4b2aee30b2babc97d4a93 jdk7u76-b01 +7e479fddbf5d7b7840319a44d9e72562d7cfd83b jdk7u76-b02 +2dcdee347bf25efe5e5d5242a5608547398bb7c7 jdk7u76-b03 +42324883f9b32a6eaaf39c8e5d8ba2c65fb1015e jdk7u76-b04 +129bfaec2a1aca5c3ca3db303dd7e7342c17e350 jdk7u76-b05 +7c564f2cbb1cc439506a26785d07683f16b9ec40 jdk7u76-b06 +c99e49a9c2bf9503135ad319bcdb3b3724d1af5c jdk7u76-b07 +e98a28d564626be745026d697d7bb68a7f053ed7 jdk7u76-b08 +7de80762ae307e56156279d84c8d1dcf73b26164 jdk7u76-b09 +c84694b00c547056b8da98ae4c0c7c9feb06863b jdk7u76-b10 +df2786b1daffc450d7e7e43c9d63aaf72a5cd2f0 jdk7u76-b11 +dc818936e1050f0058d35a7a27946e4e2bfb27ee jdk7u76-b12 +a986e4b755f388532378d595831bebece7bf72c4 jdk7u76-b13 +260565d7fba1a2d176bd43d81b0714bd19cf4459 jdk7u76-b30 +c3d2e34987eae0eabef0f4297c6f45698251f27d jdk7u76-b31 bef313c7ff7a7a829f8f6a305bf0c3738ad99795 jdk7u80-b00 0eb2482c3d0663c39794ec4c268acc41c4cd387b jdk7u80-b01 f21a65d1832ce426c02a7d87b9d83b1a4a64018c icedtea-2.6pre07 @@ -554,3 +595,5 @@ 8946500e8f3d879b28e1e257d3683efe38217b4b icedtea-2.6pre15 4bd22fe291c59aaf427b15a64423bb38ebfff2e9 icedtea-2.6pre16 f36becc08f6640b1f65e839d6d4c5bf7df23fcf4 icedtea-2.6pre17 +aaa0e97579b680842c80b0cf14c5dfd14deddbb7 jdk7u80-b04 +c104ccd5dec598e99b61ca9cb92fe4af26d450cc jdk7u80-b05
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,21 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { + @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +76,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java Thu Jan 29 22:20:22 2015 +0000 @@ -40,6 +40,8 @@ import java.net.URI; import java.net.URISyntaxException; import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Calendar; import java.util.Collections; @@ -194,8 +196,15 @@ static { - QName[] qnames = (System.getProperty(MAP_ANYURI_TO_URI) == null) ? new QName[] { - createXS("string"), + String MAP_ANYURI_TO_URI_VALUE = AccessController.doPrivileged( + new PrivilegedAction<String>() { + @Override + public String run() { + return System.getProperty(MAP_ANYURI_TO_URI); + } + } + ); + QName[] qnames = (MAP_ANYURI_TO_URI_VALUE == null) ? new QName[] { createXS("string"), createXS("anySimpleType"), createXS("normalizedString"), createXS("anyURI"), @@ -307,7 +316,7 @@ return v.toExternalForm(); } }); - if (System.getProperty(MAP_ANYURI_TO_URI) == null) { + if (MAP_ANYURI_TO_URI_VALUE == null) { secondaryList.add( new StringImpl<URI>(URI.class, createXS("string")) { public URI parse(CharSequence text) throws SAXException { @@ -771,17 +780,18 @@ } }); primaryList.add( - new StringImpl<BigDecimal>(BigDecimal.class, - createXS("decimal") + new StringImpl<BigDecimal>(BigDecimal.class, + createXS("decimal") ) { - public BigDecimal parse(CharSequence text) { - return DatatypeConverterImpl._parseDecimal(text.toString()); + public BigDecimal parse(CharSequence text) { + return DatatypeConverterImpl._parseDecimal(text.toString()); + } + + public String print(BigDecimal v) { + return DatatypeConverterImpl._printDecimal(v); + } } - - public String print(BigDecimal v) { - return DatatypeConverterImpl._printDecimal(v); - } - }); + ); primaryList.add( new StringImpl<QName>(QName.class, createXS("QName") @@ -809,7 +819,7 @@ w.getNamespaceContext().declareNamespace(v.getNamespaceURI(),v.getPrefix(),false); } }); - if (System.getProperty(MAP_ANYURI_TO_URI) != null) { + if (MAP_ANYURI_TO_URI_VALUE != null) { primaryList.add( new StringImpl<URI>(URI.class, createXS("anyURI")) { public URI parse(CharSequence text) throws SAXException { @@ -827,16 +837,17 @@ }); } primaryList.add( - new StringImpl<Duration>(Duration.class, createXS("duration")) { - public String print(Duration duration) { - return duration.toString(); - } + new StringImpl<Duration>(Duration.class, createXS("duration")) { + public String print(Duration duration) { + return duration.toString(); + } - public Duration parse(CharSequence lexical) { - TODO.checkSpec("JSR222 Issue #42"); - return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString()); + public Duration parse(CharSequence lexical) { + TODO.checkSpec("JSR222 Issue #42"); + return DatatypeConverterImpl.getDatatypeFactory().newDuration(lexical.toString()); + } } - }); + ); primaryList.add( new StringImpl<Void>(Void.class) { // 'void' binding isn't defined by the spec, but when the JAX-RPC processes user-defined
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java Thu Jan 29 22:20:22 2015 +0000 @@ -54,17 +54,20 @@ static { // we statically initializing REFLECTION_NAVIGATOR property try { - Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); - //noinspection unchecked - final Method getInstance = refNav.getDeclaredMethod("getInstance"); + final Class refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator"); // requires accessClassInPackage privilege - AccessController.doPrivileged( - new PrivilegedAction<Object>() { + final Method getInstance = AccessController.doPrivileged( + new PrivilegedAction<Method>() { @Override - public Object run() { - getInstance.setAccessible(true); - return null; + public Method run() { + try { + Method getInstance = refNav.getDeclaredMethod("getInstance"); + getInstance.setAccessible(true); + return getInstance; + } catch (NoSuchMethodException e) { + throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); + } } } ); @@ -72,16 +75,10 @@ //noinspection unchecked REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null); } catch (ClassNotFoundException e) { - e.printStackTrace(); throw new IllegalStateException("Can't find ReflectionNavigator class"); } catch (InvocationTargetException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception"); - } catch (NoSuchMethodException e) { - e.printStackTrace(); - throw new IllegalStateException("ReflectionNavigator.getInstance can't be found"); } catch (IllegalAccessException e) { - e.printStackTrace(); throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible"); } catch (SecurityException e) { LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Thu Jan 22 02:55:36 2015 +0000 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/spi/ProviderImpl.java Thu Jan 29 22:20:22 2015 +0000 @@ -139,19 +139,12 @@ } public EndpointReference readEndpointReference(final Source eprInfoset) { - // EPR constructors are private, so we need privilege escalation. - // this unmarshalling can only access instances of a fixed, known set of classes, - // so doing that shouldn't introduce security vulnerability. - return AccessController.doPrivileged(new PrivilegedAction<EndpointReference>() { - public EndpointReference run() { - try { - Unmarshaller unmarshaller = eprjc.get().createUnmarshaller(); - return (EndpointReference) unmarshaller.unmarshal(eprInfoset); - } catch (JAXBException e) { - throw new WebServiceException("Error creating Marshaller or marshalling.", e); - } - } - }); + try { + Unmarshaller unmarshaller = eprjc.get().createUnmarshaller(); + return (EndpointReference) unmarshaller.unmarshal(eprInfoset); + } catch (JAXBException e) { + throw new WebServiceException("Error creating Marshaller or marshalling.", e); + } } public <T> T getPort(EndpointReference endpointReference, Class<T> clazz, WebServiceFeature... webServiceFeatures) {