Attachment 827388 Details for Bug 966752 – diff of bugfix

[patch] diff of bugfix

file.diff (text/plain), 3.09 KB, created by Rebecca Searls on 2013-11-21 17:26:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rebecca Searls

Created: 2013-11-21 17:26:59 UTC

Size: 3.09 KB

patch

obsolete

>Index: modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java
>===================================================================
>--- modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java	(revision 0)
>+++ modules/core/src/main/java/org/jboss/ws/tools/ServerSideDocumentBuilder.java	(working copy)
>@@ -0,0 +1,23 @@
>+package org.jboss.ws.tools;
>+
>+import javax.xml.parsers.DocumentBuilderFactory;
>+
>+/**
>+ * Require the TCCL to this framework's classloader.
>+ *
>+ * User: rsearls
>+ * Date: 11/20/13
>+ */
>+public class ServerSideDocumentBuilder {
>+    public static DocumentBuilderFactory createDocumentBuilderFactory() {
>+        ClassLoader cl = Thread.currentThread().getContextClassLoader();
>+        DocumentBuilderFactory factory;
>+        try {
>+            Thread.currentThread().setContextClassLoader(ServerSideDocumentBuilder.class.getClassLoader());
>+            factory = DocumentBuilderFactory.newInstance();
>+        } finally {
>+            Thread.currentThread().setContextClassLoader(cl);
>+        }
>+        return factory;
>+    }
>+}
>Index: modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java
>===================================================================
>--- modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java	(revision 18098)
>+++ modules/core/src/main/java/org/jboss/ws/tools/wsdl/JBossWSDLReaderImpl.java	(working copy)
>@@ -68,6 +68,7 @@
> 
> import org.jboss.ws.NativeMessages;
> import org.jboss.ws.common.utils.JBossWSEntityResolver;
>+import org.jboss.ws.tools.ServerSideDocumentBuilder;
> import org.w3c.dom.Attr;
> import org.w3c.dom.Document;
> import org.w3c.dom.Element;
>@@ -2142,7 +2143,7 @@
> 	private static Document getDocument(InputSource inputSource,
> 													String desc) throws WSDLException
> 	{
>-		DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
>+		DocumentBuilderFactory factory = ServerSideDocumentBuilder.createDocumentBuilderFactory();
> 
> 		factory.setNamespaceAware(true);
> 		factory.setValidating(false);
>Index: modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java
>===================================================================
>--- modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java	(revision 18098)
>+++ modules/core/src/main/java/org/jboss/ws/tools/wsdl/WSDLDefinitionsFactory.java	(working copy)
>@@ -43,6 +43,7 @@
> import org.jboss.ws.common.utils.ResourceURL;
> import org.jboss.ws.metadata.wsdl.WSDLDefinitions;
> import org.jboss.ws.metadata.wsdl.WSDLException;
>+import org.jboss.ws.tools.ServerSideDocumentBuilder;
> import org.jboss.wsf.spi.classloading.ClassLoaderProvider;
> import org.w3c.dom.Document;
> import org.w3c.dom.Element;
>@@ -168,7 +169,7 @@
>          InputStream inputStream = new ResourceURL(wsdlLocation).openStream();
>          try
>          {
>-            DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
>+            DocumentBuilderFactory factory = ServerSideDocumentBuilder.createDocumentBuilderFactory();
> 
>             factory.setNamespaceAware(true);
>             factory.setValidating(false);

Actions: View | Diff

Attachments on bug 966752: 827388