Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java	Wed Feb 12 11:36:50 2014 -0800
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXStreamConnector.java	Fri Feb 14 10:53:55 2014 +0100
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -336,9 +336,8 @@
    1.11  
    1.12      private static Class initFIStAXReaderClass() {
    1.13          try {
    1.14 -            ClassLoader cl = getClassLoader();
    1.15 -            Class fisr = cl.loadClass("com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader");
    1.16 -            Class sdp = cl.loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser");
    1.17 +            Class<?> fisr = Class.forName("com.sun.xml.internal.org.jvnet.fastinfoset.stax.FastInfosetStreamReader");
    1.18 +            Class<?> sdp = Class.forName("com.sun.xml.internal.fastinfoset.stax.StAXDocumentParser");
    1.19              // Check if StAXDocumentParser implements FastInfosetStreamReader
    1.20              if (fisr.isAssignableFrom(sdp))
    1.21                  return sdp;
    1.22 @@ -354,7 +353,7 @@
    1.23              if (FI_STAX_READER_CLASS == null)
    1.24                  return null;
    1.25  
    1.26 -            Class c = getClassLoader().loadClass(
    1.27 +            Class c = Class.forName(
    1.28                      "com.sun.xml.internal.bind.v2.runtime.unmarshaller.FastInfosetConnector");
    1.29              return c.getConstructor(FI_STAX_READER_CLASS,XmlVisitor.class);
    1.30          } catch (Throwable e) {
    1.31 @@ -370,7 +369,7 @@
    1.32  
    1.33      private static Class initStAXExReader() {
    1.34          try {
    1.35 -            return getClassLoader().loadClass("com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx");
    1.36 +            return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamReaderEx");
    1.37          } catch (Throwable e) {
    1.38              return null;
    1.39          }
    1.40 @@ -378,19 +377,11 @@
    1.41  
    1.42      private static Constructor<? extends StAXConnector> initStAXExConnector() {
    1.43          try {
    1.44 -            Class c = getClassLoader().loadClass("com.sun.xml.internal.bind.v2.runtime.unmarshaller.StAXExConnector");
    1.45 +            Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.unmarshaller.StAXExConnector");
    1.46              return c.getConstructor(STAX_EX_READER_CLASS,XmlVisitor.class);
    1.47          } catch (Throwable e) {
    1.48              return null;
    1.49          }
    1.50      }
    1.51  
    1.52 -    private static ClassLoader getClassLoader() {
    1.53 -        ClassLoader cl = SecureLoader.getClassClassLoader(UnmarshallerImpl.class);
    1.54 -        if (cl == null) {
    1.55 -            cl = SecureLoader.getContextClassLoader();
    1.56 -        }
    1.57 -        return cl;
    1.58 -    }
    1.59 -
    1.60  }