Merge 25.8 to develop

labkey-teamcity · labkey-teamcity · commit ee8954a8bc53 · 2025-09-03T11:26:41.000Z
diff --git a/core/src/org/labkey/core/webdav/DavController.java b/core/src/org/labkey/core/webdav/DavController.java
@@ -3607,8 +3607,7 @@ private static FileTime getLastModified(InputStream in) throws IOException
     {
         try
         {
-            SAXParserFactory factory = SAXParserFactory.newInstance();
-            SAXParser saxParser = factory.newSAXParser();
+            SAXParser saxParser = XmlBeansUtil.SAX_PARSER_FACTORY.newSAXParser();
             final List<StringBuilder> lastModifieds = new ArrayList<>();
 
             saxParser.parse(new InputSource(in), new DefaultHandler()

Original file line number	Diff line number	Diff line change
`@@ -3607,8 +3607,7 @@ private static FileTime getLastModified(InputStream in) throws IOException`
`3607`	`3607`	`{`
`3608`	`3608`	`try`
`3609`	`3609`	`{`
`3610`		`- SAXParserFactory factory = SAXParserFactory.newInstance();`
`3611`		`- SAXParser saxParser = factory.newSAXParser();`
	`3610`	`+ SAXParser saxParser = XmlBeansUtil.SAX_PARSER_FACTORY.newSAXParser();`
`3612`	`3611`	`final List<StringBuilder> lastModifieds = new ArrayList<>();`
`3613`	`3612`
`3614`	`3613`	`saxParser.parse(new InputSource(in), new DefaultHandler()`