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

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.java	Tue Feb 11 14:35:59 2014 -0800
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/output/XMLStreamWriterOutput.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 @@ -153,7 +153,6 @@
    1.11          }
    1.12      }
    1.13  
    1.14 -
    1.15      /**
    1.16       * Reference to FI's XMLStreamWriter class, if FI can be loaded.
    1.17       */
    1.18 @@ -162,9 +161,8 @@
    1.19  
    1.20      private static Class initFIStAXWriterClass() {
    1.21          try {
    1.22 -            ClassLoader loader = getClassLoader();
    1.23 -            Class llfisw = Class.forName("com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter", true, loader);
    1.24 -            Class sds = loader.loadClass("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
    1.25 +            Class<?> llfisw = Class.forName("com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter");
    1.26 +            Class<?> sds = Class.forName("com.sun.xml.internal.fastinfoset.stax.StAXDocumentSerializer");
    1.27              // Check if StAXDocumentSerializer implements LowLevelFastInfosetStreamWriter
    1.28              if (llfisw.isAssignableFrom(sds))
    1.29                  return sds;
    1.30 @@ -179,8 +177,7 @@
    1.31          try {
    1.32              if (FI_STAX_WRITER_CLASS == null)
    1.33                  return null;
    1.34 -            ClassLoader loader = getClassLoader();
    1.35 -            Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput", true, loader);
    1.36 +            Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.FastInfosetStreamWriterOutput");
    1.37              return c.getConstructor(FI_STAX_WRITER_CLASS, JAXBContextImpl.class);
    1.38          } catch (Throwable e) {
    1.39              return null;
    1.40 @@ -195,8 +192,7 @@
    1.41  
    1.42      private static Class initStAXExWriterClass() {
    1.43          try {
    1.44 -            ClassLoader loader = getClassLoader();
    1.45 -            return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx",true,loader);
    1.46 +            return Class.forName("com.sun.xml.internal.org.jvnet.staxex.XMLStreamWriterEx");
    1.47          } catch (Throwable e) {
    1.48              return null;
    1.49          }
    1.50 @@ -204,20 +200,11 @@
    1.51  
    1.52      private static Constructor<? extends XmlOutput> initStAXExOutputClass() {
    1.53          try {
    1.54 -            ClassLoader loader = getClassLoader();
    1.55 -            Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.StAXExStreamWriterOutput",true, loader);
    1.56 +            Class c = Class.forName("com.sun.xml.internal.bind.v2.runtime.output.StAXExStreamWriterOutput");
    1.57              return c.getConstructor(STAXEX_WRITER_CLASS);
    1.58          } catch (Throwable e) {
    1.59              return null;
    1.60          }
    1.61      }
    1.62  
    1.63 -    private static ClassLoader getClassLoader() {
    1.64 -        ClassLoader cl = SecureLoader.getClassClassLoader(UnmarshallerImpl.class);
    1.65 -        if (cl == null) {
    1.66 -            cl = SecureLoader.getContextClassLoader();
    1.67 -        }
    1.68 -        return cl;
    1.69 -    }
    1.70 -
    1.71  }