You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jt...@apache.org on 2017/10/14 02:54:35 UTC
incubator-netbeans git commit: Use InputSource to parse xml avoid
encoding issue
Repository: incubator-netbeans
Updated Branches:
refs/heads/master b1775999d -> bb83f4972
Use InputSource to parse xml avoid encoding issue
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/bb83f497
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/bb83f497
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/bb83f497
Branch: refs/heads/master
Commit: bb83f497213a599c71c868cd43e0441eba32fdb5
Parents: b177599
Author: Eric Barboni <sk...@apache.org>
Authored: Sat Oct 14 00:28:34 2017 +0200
Committer: Jaroslav Tulach <ja...@oracle.com>
Committed: Sat Oct 14 04:53:59 2017 +0200
----------------------------------------------------------------------
nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/bb83f497/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
----------------------------------------------------------------------
diff --git a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
index f31f06e..b22b2fe 100644
--- a/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
+++ b/nbbuild/antsrc/org/netbeans/nbbuild/RatReportTask.java
@@ -20,9 +20,11 @@ package org.netbeans.nbbuild;
import java.io.BufferedReader;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashSet;
@@ -46,6 +48,7 @@ import org.apache.tools.ant.Task;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
/**
@@ -148,7 +151,10 @@ public class RatReportTask extends Task {
//read XML
try {
DocumentBuilder dBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
- Document doc = dBuilder.parse(sourceFile); // open xml source
+ InputStream inputstream = new FileInputStream(sourceFile);
+ InputStreamReader reader = new InputStreamReader(inputstream);
+ InputSource inputSource = new InputSource(reader);
+ Document doc = dBuilder.parse(inputSource); // open xml source
XPathFactory xpf = XPathFactory.newInstance();
XPath path = xpf.newXPath();