8260: Warnings and errors logged during XML processing

Reviewed-by: hirt
openjdk · Oct 14, 2024 · cf85dbc · cf85dbc
1 parent eead093
commit cf85dbc
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/...k.jmc.console.agent/src/main/java/org/openjdk/jmc/console/agent/manager/model/Preset.java b/...k.jmc.console.agent/src/main/java/org/openjdk/jmc/console/agent/manager/model/Preset.java
@@ -165,6 +165,7 @@ public void deserialize(String xmlSource) throws IOException, SAXException {
 			factory.setExpandEntityReferences(false);
 			factory.setValidating(true);
 			builder = factory.newDocumentBuilder();
+			builder.setErrorHandler(null);
 		} catch (ParserConfigurationException e) {
 			// This should not happen anyway
 			throw new RuntimeException(e);

diff --git a/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/util/XmlToolkit.java b/core/org.openjdk.jmc.common/src/main/java/org/openjdk/jmc/common/util/XmlToolkit.java
@@ -170,8 +170,9 @@ public static Document createNewDocument(String rootElementName) throws IOExcept
 			InputSource xml = new InputSource(
 					new StringReader("<?xml version=\"1.0\" encoding=\"UTF-8\"?><" + rootElementName + "/>")); //$NON-NLS-1$ //$NON-NLS-2$
 			DocumentBuilderFactory dbf = createDocumentBuildFactoryInstance();
-
-			doc = dbf.newDocumentBuilder().parse(xml);
+			DocumentBuilder documentBuilder = dbf.newDocumentBuilder();
+			documentBuilder.setErrorHandler(null);
+			doc = documentBuilder.parse(xml);
 		} catch (IOException e) {
 			// just rethrow
 			throw e;
@@ -380,6 +381,7 @@ private static DocumentBuilder getDocumentBuilder() {
 		try {
 			DocumentBuilderFactory factory = createDocumentBuildFactoryInstance();
 			docBuilder = factory.newDocumentBuilder();
+			docBuilder.setErrorHandler(null);
 		} catch (ParserConfigurationException e) {
 			// This shouldn't happen since all configuration is done within XmlToolkit
 			LOGGER.log(Level.WARNING, "Parser configuration error", e); //$NON-NLS-1$

diff --git a/...ration/src/main/java/org/openjdk/jmc/flightrecorder/configuration/model/xml/XMLModel.java b/...ration/src/main/java/org/openjdk/jmc/flightrecorder/configuration/model/xml/XMLModel.java
@@ -157,6 +157,7 @@ public static XMLModel create(InputSource input, IXMLValidator validator) throws
 			SAXParser sp = spf.newSAXParser();
 			XMLReader xr = sp.getXMLReader();
 			XMLModelBuilder dataHandler = new XMLModelBuilder(dummyRoot);
+			xr.setErrorHandler(null);
 			xr.setContentHandler(dataHandler);
 			xr.parse(input);
 			List<XMLTagInstance> instances = dummyRoot.getTagsInstances();

diff --git a/...dk.test/src/main/java/org/openjdk/jmc/flightrecorder/test/rules/jdk/TestRulesWithJfr.java b/...dk.test/src/main/java/org/openjdk/jmc/flightrecorder/test/rules/jdk/TestRulesWithJfr.java
@@ -224,6 +224,7 @@ private static ReportCollection parseRulesReportXml(String directory, String fil
 			docFactory.setFeature(XML_PARSER_DISALLOW_DOCTYPE_ATTRIBUTE, true);
 			docFactory.setValidating(true);
 			DocumentBuilder docBuilder = docFactory.newDocumentBuilder();
+			docBuilder.setErrorHandler(null);
 			Document baselineDoc = docBuilder.parse(file);
 			collection = ReportCollection.fromXml(baselineDoc, reportName);
 		} catch (ParserConfigurationException | SAXException | IOException e) {

diff --git a/...org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/util/listversions/ListVersions.java b/...org.openjdk.jmc.util.listversions/src/org/openjdk/jmc/util/listversions/ListVersions.java
@@ -48,6 +48,7 @@
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
+import org.xml.sax.ErrorHandler;
 
 public class ListVersions {
 	private static final String XML_PARSER_DISALLOW_DOCTYPE_ATTRIBUTE = "http://apache.org/xml/features/disallow-doctype-decl"; //$NON-NLS-1$
@@ -100,6 +101,7 @@ public static Map<String, String> getNewVersions(String eclipseVersion) {
 			dbFactory.setFeature(XML_PARSER_DISALLOW_DOCTYPE_ATTRIBUTE, true);
 			dbFactory.setValidating(true);
 			DocumentBuilder dBuilder = dbFactory.newDocumentBuilder();
+			dBuilder.setErrorHandler(null);
 			Document compositeDoc = dBuilder.parse(compositeZipStream);
 
 			NodeList childrenList = compositeDoc.getElementsByTagName("child");