Skip to content

Fixed #1824: Now caching TransformerFactory to prevent countless expensive factory creations #1855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+38 −2
Open

Fixed #1824: Now caching TransformerFactory to prevent countless expensive factory creations #1855

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 38 additions & 2 deletions jaxb-ri/core/src/main/java/org/glassfish/jaxb/core/v2/util/XmlFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@

import org.glassfish.jaxb.core.v2.Messages;

import java.lang.ref.SoftReference;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Objects;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.XMLConstants;
Expand Down Expand Up @@ -130,17 +134,49 @@ public static XPathFactory createXPathFactory(boolean disableSecureProcessing) t
}
}

private static final class TransformerFactoryConfig {
private boolean disableSecureProcessing;
private String factoryName;

private TransformerFactoryConfig(final boolean disableSecureProcessing, final String factoryName) {
this.disableSecureProcessing = disableSecureProcessing;
this.factoryName = factoryName;
}

@Override
public int hashCode() {
return Objects.hash(this.disableSecureProcessing, this.factoryName);
}

@Override
public boolean equals(final Object other) {
if (!(other instanceof TransformerFactoryConfig))
return false;
final TransformerFactoryConfig that = (TransformerFactoryConfig) other;
return this.disableSecureProcessing == that.disableSecureProcessing && Objects.equals(this.factoryName, that.factoryName);
}
}

private static final Map<TransformerFactoryConfig, SoftReference<TransformerFactory>> TRANSFORMER_FACTORY_CACHE = new ConcurrentHashMap<>();

/**
* Returns properly configured (e.g. security features) factory
* - securityProcessing == is set based on security processing property, default is true
*/
public static TransformerFactory createTransformerFactory(boolean disableSecureProcessing) throws IllegalStateException {
try {
TransformerFactory factory = TransformerFactory.newInstance();
final TransformerFactoryConfig config = new TransformerFactoryConfig(disableSecureProcessing, System.getProperty("javax.xml.transform.TransformerFactory"));
final SoftReference<TransformerFactory> softReference = TRANSFORMER_FACTORY_CACHE.get(config);
TransformerFactory factory = softReference == null ? null : softReference.get();
if (factory == null) {
factory = TransformerFactory.newInstance();
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, !isXMLSecurityDisabled(disableSecureProcessing));
TRANSFORMER_FACTORY_CACHE.put(config, new SoftReference(factory));
}

if (LOGGER.isLoggable(Level.FINE)) {
LOGGER.log(Level.FINE, "TransformerFactory instance: {0}", factory);
}
factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, !isXMLSecurityDisabled(disableSecureProcessing));
return factory;
} catch (TransformerConfigurationException ex) {
LOGGER.log(Level.SEVERE, null, ex);
Expand Down