LDEV-5157 - change rules for TransformerFactory loading

lucee · Dec 6, 2024 · 7b89cdc · 7b89cdc
1 parent ca9cb89
commit 7b89cdc
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 20 deletions.
diff --git a/core/src/main/java/lucee/runtime/text/xml/XMLUtil.java b/core/src/main/java/lucee/runtime/text/xml/XMLUtil.java
@@ -251,29 +251,38 @@ public static URL getTransformerFactoryResource() throws IOException {
 	private static TransformerFactory _newTransformerFactory() {
 
 		Thread.currentThread().setContextClassLoader(EnvClassLoader.getInstance((ConfigPro) ThreadLocalPageContext.getConfig()));
-		TransformerFactory factory = null;
-		Class clazz = null;
 		try {
-			clazz = ClassUtil.loadClass("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
+			return TransformerFactory.newInstance();
 		}
-		catch (Exception e) {
-			try {
-				clazz = ClassUtil.loadClass("org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl");
-			}
-			catch (Exception ee) {
-			}
+		catch (Throwable t) {
+			LogUtil.log("xml", t);
+			ExceptionUtil.rethrowIfNecessary(t);
 		}
-		if (clazz != null) {
-			try {
-				factory = (TransformerFactory) ClassUtil.loadInstance(clazz);
-			}
-			catch (Exception e) {
-			}
+
+		try {
+			return (TransformerFactory) ClassUtil.loadInstance(ClassUtil.loadClass("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"));
+		}
+		catch (Throwable t) {
+			LogUtil.log("xml", t);
+			ExceptionUtil.rethrowIfNecessary(t);
 		}
-		if (factory == null) return factory = TransformerFactory.newInstance();
-		LogUtil.log(Log.LEVEL_INFO, "application", "xml", factory.getClass().getName() + " is used as TransformerFactory");
 
-		return factory;
+		try {
+			return (TransformerFactory) ClassUtil.loadInstance(ClassUtil.loadClass("org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"));
+		}
+		catch (Throwable t) {
+			LogUtil.log("xml", t);
+			ExceptionUtil.rethrowIfNecessary(t);
+		}
+
+		try {
+			return (TransformerFactory) ClassUtil.loadInstance(ClassUtil.loadClass("org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"));
+		}
+		catch (Throwable t) {
+			LogUtil.log("xml", t);
+			ExceptionUtil.rethrowIfNecessary(t);
+		}
+		return TransformerFactory.newInstance();
 	}
 
 	public static final Document parse(InputSource xml, InputSource validator, boolean isHtml) throws SAXException, IOException {

diff --git a/loader/build.xml b/loader/build.xml
@@ -2,7 +2,7 @@
 <project default="core" basedir="." name="Lucee" 
   xmlns:resolver="antlib:org.apache.maven.resolver.ant">
 
-  <property name="version" value="6.2.0.184-SNAPSHOT"/>
+  <property name="version" value="6.2.0.185-SNAPSHOT"/>
 
   <taskdef uri="antlib:org.apache.maven.resolver.ant" resource="org/apache/maven/resolver/ant/antlib.xml">
     <classpath>

diff --git a/loader/pom.xml b/loader/pom.xml
@@ -3,7 +3,7 @@
 
   <groupId>org.lucee</groupId>
   <artifactId>lucee</artifactId>
-  <version>6.2.0.184-SNAPSHOT</version>
+  <version>6.2.0.185-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>Lucee Loader Build</name>