1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java Fri Feb 14 10:53:55 2014 +0100
1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/ws/commons/xmlutil/Converter.java Fri Feb 14 11:13:45 2014 +0100
1.3 @@ -53,7 +53,12 @@
1.4 // prevents instantiation
1.5 }
1.6 private static final Logger LOGGER = Logger.getLogger(Converter.class);
1.7 - private static final XMLOutputFactory xmlOutputFactory = XMLOutputFactory.newInstance();
1.8 + private static final ContextClassloaderLocal<XMLOutputFactory> xmlOutputFactory = new ContextClassloaderLocal<XMLOutputFactory>() {
1.9 + @Override
1.10 + protected XMLOutputFactory initialValue() throws Exception {
1.11 + return XMLOutputFactory.newInstance();
1.12 + }
1.13 + };
1.14 private static final AtomicBoolean logMissingStaxUtilsWarning = new AtomicBoolean(false);
1.15
1.16 /**
1.17 @@ -110,7 +115,7 @@
1.18 stringOut = new StringWriter();
1.19 XMLStreamWriter writer = null;
1.20 try {
1.21 - writer = xmlOutputFactory.createXMLStreamWriter(stringOut);
1.22 + writer = xmlOutputFactory.get().createXMLStreamWriter(stringOut);
1.23 if (createIndenter) {
1.24 writer = createIndenter(writer);
1.25 }
1.26 @@ -143,7 +148,7 @@
1.27
1.28 try {
1.29 if (message != null) {
1.30 - XMLStreamWriter xsw = xmlOutputFactory.createXMLStreamWriter(baos, encoding);
1.31 + XMLStreamWriter xsw = xmlOutputFactory.get().createXMLStreamWriter(baos, encoding);
1.32 try {
1.33 message.writeTo(xsw);
1.34 } finally {
