Skip to content

Commit 84b07f8

Browse files
Ensure consistent XML parser config (#2890)
1 parent c714f4c commit 84b07f8

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

src/org/labkey/test/util/PipelineAnalysisHelper.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import org.jetbrains.annotations.NotNull;
1919
import org.jetbrains.annotations.Nullable;
20+
import org.labkey.api.util.XmlBeansUtil;
2021
import org.labkey.test.BaseWebDriverTest;
2122
import org.labkey.test.Locator;
2223
import org.labkey.test.TestFileUtils;
@@ -27,7 +28,6 @@
2728
import org.xml.sax.InputSource;
2829

2930
import javax.xml.parsers.DocumentBuilder;
30-
import javax.xml.parsers.DocumentBuilderFactory;
3131
import javax.xml.xpath.XPath;
3232
import javax.xml.xpath.XPathConstants;
3333
import javax.xml.xpath.XPathExpression;
@@ -78,7 +78,7 @@ public void runPipelineAnalysis(@LoggedParam String importAction, String[] files
7878
for (String file : files)
7979
{
8080
String directory = file.substring(0, file.lastIndexOf("/") + 1);
81-
String fileName = file.substring(file.lastIndexOf("/") + 1, file.length());
81+
String fileName = file.substring(file.lastIndexOf("/") + 1);
8282
if (filePrefix == null)
8383
{
8484
filePrefix = directory;
@@ -252,8 +252,7 @@ private Map<String, String> loadParameterMapFromXmlString(String xml)
252252
{
253253
try
254254
{
255-
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
256-
DocumentBuilder builder = factory.newDocumentBuilder();
255+
DocumentBuilder builder = XmlBeansUtil.DOCUMENT_BUILDER_FACTORY.newDocumentBuilder();
257256
InputSource is = new InputSource(new StringReader(xml));
258257
Document doc = builder.parse(is);
259258

0 commit comments

Comments
 (0)