You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openaz.apache.org by co...@apache.org on 2015/07/13 18:25:14 UTC
[2/2] incubator-openaz git commit: Rationalise some of the
DocumentBuilder calls in DOMUtil
Rationalise some of the DocumentBuilder calls in DOMUtil
Project: http://git-wip-us.apache.org/repos/asf/incubator-openaz/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-openaz/commit/9a7edafa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-openaz/tree/9a7edafa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-openaz/diff/9a7edafa
Branch: refs/heads/master
Commit: 9a7edafa869a8641bb4646cbc34fcef4026cdbe1
Parents: 90a0f55
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 13 17:24:57 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 13 17:24:57 2015 +0100
----------------------------------------------------------------------
.../apache/openaz/xacml/std/dom/DOMUtil.java | 34 ++++++--------------
1 file changed, 9 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-openaz/blob/9a7edafa/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
----------------------------------------------------------------------
diff --git a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
index cd8b0db..adb3d3e 100644
--- a/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
+++ b/openaz-xacml/src/main/java/org/apache/openaz/xacml/std/dom/DOMUtil.java
@@ -86,9 +86,7 @@ public class DOMUtil {
public static Node getDirectDocumentChild(Node node) throws DOMStructureException {
Node nodeResult = null;
try {
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- documentBuilderFactory.setNamespaceAware(true);
- DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ DocumentBuilder documentBuilder = getDocumentBuilder();
Document documentRoot = documentBuilder.newDocument();
Node nodeTopRoot = documentRoot.importNode(node, true);
documentRoot.appendChild(nodeTopRoot);
@@ -712,8 +710,8 @@ public class DOMUtil {
}
return false;
}
-
- public static Document loadDocument(File fileDocument) throws DOMStructureException {
+
+ public static DocumentBuilder getDocumentBuilder() throws DOMStructureException {
/*
* Get the DocumentBuilderFactory
*/
@@ -726,12 +724,15 @@ public class DOMUtil {
/*
* Get the DocumentBuilder
*/
- DocumentBuilder documentBuilder = null;
try {
- documentBuilder = documentBuilderFactory.newDocumentBuilder();
+ return documentBuilderFactory.newDocumentBuilder();
} catch (Exception ex) {
throw new DOMStructureException("Exception creating DocumentBuilder: " + ex.getMessage(), ex);
}
+ }
+
+ public static Document loadDocument(File fileDocument) throws DOMStructureException {
+ DocumentBuilder documentBuilder = getDocumentBuilder();
/*
* Parse the XML file
@@ -751,24 +752,7 @@ public class DOMUtil {
}
public static Document loadDocument(InputStream inputStreamDocument) throws DOMStructureException {
- /*
- * Get the DocumentBuilderFactory
- */
- DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
- if (documentBuilderFactory == null) {
- throw new DOMStructureException("No XML DocumentBuilderFactory configured");
- }
- documentBuilderFactory.setNamespaceAware(true);
-
- /*
- * Get the DocumentBuilder
- */
- DocumentBuilder documentBuilder = null;
- try {
- documentBuilder = documentBuilderFactory.newDocumentBuilder();
- } catch (Exception ex) {
- throw new DOMStructureException("Exception creating DocumentBuilder: " + ex.getMessage(), ex);
- }
+ DocumentBuilder documentBuilder = getDocumentBuilder();
/*
* Parse the XML file