1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java Fri Feb 14 10:53:55 2014 +0100 1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/ws/wsdl/parser/Internalizer.java Fri Feb 14 11:13:45 2014 +0100 1.3 @@ -1,5 +1,5 @@ 1.4 /* 1.5 - * Copyright (c) 1997, 2013, 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 @@ -60,12 +60,10 @@ 1.11 */ 1.12 public class Internalizer { 1.13 1.14 - private static final XPathFactory xpf = XmlUtil.newXPathFactory(true); 1.15 - private final XPath xpath = xpf.newXPath(); 1.16 + private final XPath xpath = xpf.get().newXPath(); 1.17 private final DOMForest forest; 1.18 private final ErrorReceiver errorReceiver; 1.19 1.20 - 1.21 public Internalizer(DOMForest forest, WsimportOptions options, ErrorReceiver errorReceiver) { 1.22 this.forest = forest; 1.23 this.errorReceiver = errorReceiver; 1.24 @@ -77,6 +75,12 @@ 1.25 } 1.26 } 1.27 1.28 + private static final ContextClassloaderLocal<XPathFactory> xpf = new ContextClassloaderLocal<XPathFactory>() { 1.29 + @Override 1.30 + protected XPathFactory initialValue() throws Exception { 1.31 + return XPathFactory.newInstance(); 1.32 + } 1.33 + }; 1.34 /** 1.35 * Validates attributes of a <JAXWS:bindings> element. 1.36 */