Skip to content

WW-5647 Use ConcurrentHashMap for XSLT template cache #1781

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
arunmanni-ai wants to merge 1 commit into
base: main
Choose a base branch
from
+18 −18
Open

WW-5647 Use ConcurrentHashMap for XSLT template cache #1781

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
36 changes: 18 additions & 18 deletions plugins/xslt/src/main/java/org/apache/struts2/result/xslt/XSLTResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
import java.io.IOException;
import java.io.PrintWriter;
import java.net.URL;
import java.util.HashMap;
import java.util.concurrent.ConcurrentHashMap;
import java.util.Map;

/**
Expand All @@ -68,11 +68,7 @@ public class XSLTResult implements Result {
/**
* Cache of all templates.
*/
private static final Map<String, Templates> templatesCache;

static {
templatesCache = new HashMap<>();
}
private static final Map<String, Templates> templatesCache = new ConcurrentHashMap<>();

// Configurable Parameters

Expand Down Expand Up @@ -283,19 +279,23 @@ protected Templates getTemplates(final String path) throws TransformerException,

if (noCache || (templates == null)) {
synchronized (templatesCache) {
URL resource = ServletActionContext.getServletContext().getResource(path);

if (resource == null) {
throw new TransformerException("Stylesheet " + path + " not found in resources.");
// Re-check after acquiring lock to avoid redundant compilation
templates = templatesCache.get(path);
if (noCache || (templates == null)) {
URL resource = ServletActionContext.getServletContext().getResource(path);

if (resource == null) {
throw new TransformerException("Stylesheet " + path + " not found in resources.");
}

LOG.debug("Preparing XSLT stylesheet templates: {}", path);

TransformerFactory factory = createTransformerFactory();
factory.setURIResolver(getURIResolver());
factory.setErrorListener(buildErrorListener());
templates = factory.newTemplates(new StreamSource(resource.openStream()));
templatesCache.put(path, templates);
}

LOG.debug("Preparing XSLT stylesheet templates: {}", path);

TransformerFactory factory = createTransformerFactory();
factory.setURIResolver(getURIResolver());
factory.setErrorListener(buildErrorListener());
templates = factory.newTemplates(new StreamSource(resource.openStream()));
templatesCache.put(path, templates);
}
}

Expand Down