Mercurial > hg > release > icedtea7-forest-2.5 > jaxws

changeset 929:b5384b2fb987 icedtea-2.5.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge jdk7u65-b32
author andrew
date Tue, 15 Jul 2014 22:47:38 +0100
parents 19e5d8e33c52 (current diff) 0cd66509e113 (diff)
children aac78bd724c4
files .hgtags src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java src/share/jaxws_classes/com/sun/xml/internal/ws/policy/sourcemodel/attach/ExternalAttachmentsUnmarshaller.java
diffstat 2 files changed, 28 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Apr 09 10:15:04 2014 -0400
+++ b/.hgtags	Tue Jul 15 22:47:38 2014 +0100
@@ -420,6 +420,7 @@
 a257072fc2aa482abd6ffa28e235dbe532af6d00 jdk7u55-b02
 2916fdfc475bf29bc702887bf5ba02df67c98916 jdk7u55-b03
 f4759b4547602b3bc865db8c5f356f46979c6389 jdk7u55-b04
+8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u65-b00
 8a8dfdbc66149b89f804c5a50e4692c2520569ae jdk7u55-b05
 2696d6747826cea92a97b2d80be4a59ff99462bd jdk7u55-b06
 1ad971afe2b5db93420654fa65b23f827760fed7 jdk7u55-b07
@@ -432,7 +433,10 @@
 3b0da73591b1ea23c48aa7babc34ed776fc183f0 jdk7u55-b13
 5d726bf8fedc1f10d250e980653315919b7602f2 jdk7u55-b30
 81d0f297557c4a876727cabeb2bfcdf066a1fc9d jdk7u55-b14
+f616603ab693f6629c2994f6006ed4a21a428d8e jdk7u55-b15
 2d103c97c9bd0b3357e6d5e2b5b9ffb64c271288 jdk7u55-b31
+b15b4084288fa4ea9caf7f6b4e79d164c77bb1d6 jdk7u55-b32
+efd71c6ca0832e894b7e1619111860062fa96458 jdk7u55-b33
 cb5f95263f620967f5097c5ff8e0b27cfb9e8c44 jdk7u60-b00
 f675dfce1e61a6ed01732ae7cfbae941791cba74 jdk7u60-b01
 8a3b9e8492a5ac4e2e0c166dbfc5d058be244377 jdk7u60-b02
@@ -456,10 +460,30 @@
 3a7c902a4390ed227747724f427a516e22a7d77a icedtea-2.5pre06
 9639895f69500ce364e4555a157c6875bb6e51dc icedtea-2.5pre05
 2fc16d3a321212abc0cc93462b22c4be7f693ab9 jdk7u60-b16
+b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
 b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b18
-b312ec543dc09db784e161eb89607d4afd4cab1e jdk7u60-b17
+23598a667bb89b57d5abab5b37781a0952e16cf9 jdk7u65-b01
 1d21eb9011a060c7761c9a8a53e69d58bbea4893 jdk7u60-b19
 39e67887a3b112bf74f84df2aac0f46c65bfb005 jdk7u60-b30
 9699fe5c5232952a0c75e4a5562d86b33ebe6bf5 icedtea-2.5pre07
 f1f1ade53c01f57c8b5c8c0bd0864bc59b294a07 icedtea-2.5pre08
 f1f1ade53c01f57c8b5c8c0bd0864bc59b294a07 icedtea-2.5.0
+8ac19021e6af5d92b46111a6c41430f36ccdb901 jdk7u65-b02
+a70d681bc273a110d10cf3c4f9b35b25ca6a600f jdk7u65-b03
+7cd17f96988509e99fbb71003aeb76d92b638fef jdk7u65-b04
+7bafb24c6466999bc08742b160d0e450bc12a2c5 jdk7u65-b05
+35b31c516cab0a81fa9d2a119ec101be3f5a2969 jdk7u65-b06
+eb89c1c30a93b1d43cbc1b7520bca46d31d0829a jdk7u65-b07
+d63ca1c5bdb9fb2e36ec4afda431c0d1dfdfc07c jdk7u65-b08
+e4cc1e93c6332c8463e75a25c3d735884d185259 jdk7u65-b09
+d10ec17267415303a71d358ae6202369db77ba96 jdk7u65-b10
+2f5dcee6d56b00551db21408ebad2ff2faad7c7a jdk7u65-b11
+f03350485cd388620981bb7e7faa2d1890d11a1b jdk7u65-b12
+471f883e9830d8341248b99da7c9cfab9fcc94d6 jdk7u65-b13
+11deffa2096f08dab69de13d4fcf361c6d252636 jdk7u65-b14
+39ad61a579fd824fbec1bec4e071376449ba8195 jdk7u65-b15
+198bf1acd262f2c16715d3be5e33d7b8de1e7776 jdk7u65-b16
+df4dc644fe344e973fc1692c28683eec8ba82600 jdk7u65-b17
+0e0ca87a6d5212a0885f0c8c00b8f7cf24a64d89 jdk7u65-b30
+dedfc93eeb5f4b28ad1a91902a0676aef0937e42 jdk7u65-b18
+db4cccbfd72fc265b736a273797963754434a7d2 jdk7u65-b19
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Wed Apr 09 10:15:04 2014 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Tue Jul 15 22:47:38 2014 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -130,14 +130,6 @@
     private final Map<TypeReference,Bridge> bridges = new LinkedHashMap<TypeReference,Bridge>();
 
     /**
-     * Shared instance of {@link TransformerFactory}.
-     * Lock before use, because a {@link TransformerFactory} is not thread-safe
-     * whereas {@link JAXBContextImpl} is.
-     * Lazily created.
-     */
-    private volatile static SAXTransformerFactory tf;
-
-    /**
      * Shared instance of {@link DocumentBuilder}.
      * Lock before use. Lazily created.
      */
@@ -702,13 +694,7 @@
      */
     static Transformer createTransformer() {
         try {
-            if (tf==null) {
-                synchronized(JAXBContextImpl.class) {
-                    if (tf==null) {
-                        tf = (SAXTransformerFactory)TransformerFactory.newInstance();
-                    }
-                }
-            }
+            SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
             return tf.newTransformer();
         } catch (TransformerConfigurationException e) {
             throw new Error(e); // impossible
@@ -720,13 +706,7 @@
      */
     public static TransformerHandler createTransformerHandler() {
         try {
-            if (tf==null) {
-                synchronized(JAXBContextImpl.class) {
-                    if (tf==null) {
-                        tf = (SAXTransformerFactory)TransformerFactory.newInstance();
-                    }
-                }
-            }
+            SAXTransformerFactory tf = (SAXTransformerFactory)TransformerFactory.newInstance();
             return tf.newTransformerHandler();
         } catch (TransformerConfigurationException e) {
             throw new Error(e); // impossible