changeset 751:c3a650bee848

8028090: reverting change - changeset pushed with incorrect commit message, linked to wrong issue Reviewed-by: asaha
author mkos
date Sat, 09 Nov 2013 10:15:41 +0100
parents b0ef08d5e517
children da128632f015
files src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java
diffstat 1 files changed, 4 insertions(+), 40 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java	Fri Nov 08 20:15:52 2013 +0100
+++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/fault/SOAPFaultBuilder.java	Sat Nov 09 10:15:41 2013 +0100
@@ -59,12 +59,6 @@
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
-import java.lang.reflect.ReflectPermission;
-import java.security.AccessControlContext;
-import java.security.AccessController;
-import java.security.Permissions;
-import java.security.PrivilegedAction;
-import java.security.ProtectionDomain;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Level;
@@ -552,40 +546,10 @@
             // ignore
         }
 
-        JAXB_CONTEXT = createJAXBContext();
-    }
-
-    private static JAXBRIContext createJAXBContext() {
-
-        // in jdk runtime doPrivileged is necessary since JAX-WS internal classes are in restricted packages
-        if (isJDKRuntime()) {
-            Permissions permissions = new Permissions();
-            permissions.add(new RuntimePermission("accessClassInPackage.com.sun." + "xml.internal.ws.fault"));
-            permissions.add(new ReflectPermission("suppressAccessChecks"));
-            return AccessController.doPrivileged(
-                    new PrivilegedAction<JAXBRIContext>() {
-                        @Override
-                        public JAXBRIContext run() {
-                            try {
-                                return (JAXBRIContext) JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
-                            } catch (JAXBException e) {
-                                throw new Error(e);
-                            }
-                        }
-                    },
-                    new AccessControlContext(new ProtectionDomain[]{new ProtectionDomain(null, permissions)})
-            );
-
-        } else {
-            try {
-                return (JAXBRIContext) JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
-            } catch (JAXBException e) {
-                throw new Error(e);
-            }
+        try {
+            JAXB_CONTEXT = (JAXBRIContext)JAXBContext.newInstance(SOAP11Fault.class, SOAP12Fault.class);
+        } catch (JAXBException e) {
+            throw new Error(e); // this must be a bug in our code
         }
     }
-
-    private static boolean isJDKRuntime() {
-        return SOAPFaultBuilder.class.getName().contains("internal");
-    }
 }