You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2026/04/21 11:45:52 UTC

(ws-neethi) 02/02: Minor fixes

This is an automated email from the ASF dual-hosted git repository.

coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ws-neethi.git

commit a488afcbabcb7b0f394412b8ac620b202b675309
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Apr 21 12:45:35 2026 +0100

    Minor fixes
---
 src/main/java/org/apache/neethi/PolicyReference.java                 | 2 +-
 .../org/apache/neethi/builders/converters/DOMToStaxConverter.java    | 5 ++++-
 .../java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java   | 5 ++++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/apache/neethi/PolicyReference.java b/src/main/java/org/apache/neethi/PolicyReference.java
index 5490208..52d84a5 100644
--- a/src/main/java/org/apache/neethi/PolicyReference.java
+++ b/src/main/java/org/apache/neethi/PolicyReference.java
@@ -158,7 +158,7 @@ public class PolicyReference implements PolicyComponent {
                 if (pe == null) {
                     pe = new PolicyBuilder();
                 }
-                return pe.getPolicy(connection.getInputStream());
+                return pe.getPolicy(in);
             } finally {
                 in.close();
             }
diff --git a/src/main/java/org/apache/neethi/builders/converters/DOMToStaxConverter.java b/src/main/java/org/apache/neethi/builders/converters/DOMToStaxConverter.java
index 1c9eaec..d4d8158 100644
--- a/src/main/java/org/apache/neethi/builders/converters/DOMToStaxConverter.java
+++ b/src/main/java/org/apache/neethi/builders/converters/DOMToStaxConverter.java
@@ -34,7 +34,10 @@ public class DOMToStaxConverter extends AbstractDOMConverter
 
     public XMLStreamReader convert(Element s) {
         try {
-            return XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(s));
+            XMLInputFactory xif = XMLInputFactory.newInstance();
+            xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+            xif.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+            return xif.createXMLStreamReader(new DOMSource(s));
         } catch (XMLStreamException ex) {
             throw new ConverterException(ex);
         }
diff --git a/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java b/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
index 2dc267e..3fc5a92 100644
--- a/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
+++ b/src/main/java/org/apache/neethi/builders/xml/XmlPrimitiveAssertion.java
@@ -120,7 +120,10 @@ public class XmlPrimitiveAssertion extends PrimitiveAssertion implements Asserti
 
     public void serialize(XMLStreamWriter writer) throws XMLStreamException {
         if (element != null) {
-            copyEvents(XMLInputFactory.newInstance().createXMLEventReader(new DOMSource(element)), writer);
+            XMLInputFactory xif = XMLInputFactory.newInstance();
+            xif.setProperty(XMLInputFactory.IS_SUPPORTING_EXTERNAL_ENTITIES, Boolean.FALSE);
+            xif.setProperty(XMLInputFactory.SUPPORT_DTD, Boolean.FALSE);
+            copyEvents(xif.createXMLEventReader(new DOMSource(element)), writer);
         } else {
             throw new RuntimeException("Wrapped Element is not set");
         }