You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/11/22 04:58:41 UTC
[karaf] 01/01: [KARAF-6016] Fix regression loading blueprint files
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch karaf-4.1.x
in repository https://gitbox.apache.org/repos/asf/karaf.git
commit 76bd5b20099d60517019ad86e88769a9dbd00b01
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Wed Nov 21 18:20:18 2018 +0100
[KARAF-6016] Fix regression loading blueprint files
---
util/src/main/java/org/apache/karaf/util/XmlUtils.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/util/src/main/java/org/apache/karaf/util/XmlUtils.java b/util/src/main/java/org/apache/karaf/util/XmlUtils.java
index 19ae42a..79d2007 100644
--- a/util/src/main/java/org/apache/karaf/util/XmlUtils.java
+++ b/util/src/main/java/org/apache/karaf/util/XmlUtils.java
@@ -136,8 +136,9 @@ public class XmlUtils {
TransformerFactory tf = TRANSFORMER_FACTORY.get();
if (tf == null) {
tf = TransformerFactory.newInstance();
- tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
- tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ // KARAF-6016: avoid regression with blueprint especially
+ // tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ // tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
TRANSFORMER_FACTORY.set(tf);
}
return tf.newTransformer();
@@ -147,8 +148,9 @@ public class XmlUtils {
TransformerFactory tf = TRANSFORMER_FACTORY.get();
if (tf == null) {
tf = TransformerFactory.newInstance();
- tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
- tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
+ // KARAF-6016: avoid regression with blueprint especially
+ // tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_DTD, "");
+ // tf.setAttribute(XMLConstants.ACCESS_EXTERNAL_STYLESHEET, "");
TRANSFORMER_FACTORY.set(tf);
}
return tf.newTransformer(xsltSource);