src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java

changeset 558
d950f4a0753b
parent 515
6cd506508147
child 637
9c07ef4934dd
     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Fri Feb 14 10:53:55 2014 +0100
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Fri Feb 14 11:13:45 2014 +0100
     1.3 @@ -129,14 +129,6 @@
     1.4      private final Map<TypeReference,Bridge> bridges = new LinkedHashMap<TypeReference,Bridge>();
     1.5  
     1.6      /**
     1.7 -     * Shared instance of {@link TransformerFactory}.
     1.8 -     * Lock before use, because a {@link TransformerFactory} is not thread-safe
     1.9 -     * whereas {@link JAXBContextImpl} is.
    1.10 -     * Lazily created.
    1.11 -     */
    1.12 -    private volatile static SAXTransformerFactory tf;
    1.13 -
    1.14 -    /**
    1.15       * Shared instance of {@link DocumentBuilder}.
    1.16       * Lock before use. Lazily created.
    1.17       */
    1.18 @@ -705,13 +697,7 @@
    1.19       */
    1.20      static Transformer createTransformer(boolean disableSecureProcessing) {
    1.21          try {
    1.22 -            if (tf==null) {
    1.23 -                synchronized(JAXBContextImpl.class) {
    1.24 -                    if (tf==null) {
    1.25 -                        tf = (SAXTransformerFactory)XmlFactory.createTransformerFactory(disableSecureProcessing);
    1.26 -                    }
    1.27 -                }
    1.28 -            }
    1.29 +            SAXTransformerFactory tf = (SAXTransformerFactory)XmlFactory.createTransformerFactory(disableSecureProcessing);
    1.30              return tf.newTransformer();
    1.31          } catch (TransformerConfigurationException e) {
    1.32              throw new Error(e); // impossible
    1.33 @@ -723,13 +709,7 @@
    1.34       */
    1.35      public static TransformerHandler createTransformerHandler(boolean disableSecureProcessing) {
    1.36          try {
    1.37 -            if (tf==null) {
    1.38 -                synchronized(JAXBContextImpl.class) {
    1.39 -                    if (tf==null) {
    1.40 -                        tf = (SAXTransformerFactory)XmlFactory.createTransformerFactory(disableSecureProcessing);
    1.41 -                    }
    1.42 -                }
    1.43 -            }
    1.44 +            SAXTransformerFactory tf = (SAXTransformerFactory)XmlFactory.createTransformerFactory(disableSecureProcessing);
    1.45              return tf.newTransformerHandler();
    1.46          } catch (TransformerConfigurationException e) {
    1.47              throw new Error(e); // impossible

mercurial