Skip to content
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

Jump to bottom

fix(perf) don't create session if it is not required #30322

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(perf) don't create session if it is not required #30322

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions dotCMS/src/main/java/com/dotcms/variant/business/web/CurrentVariantWebInterceptor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public Result intercept(final HttpServletRequest request, final HttpServletRespo
}

if (!UtilMethods.isSet(currentVariantName)) {
final HttpSession session = request.getSession();
final HttpSession session = request.getSession(false);

if (session != null) {
final Object attribute = session.getAttribute(VariantAPI.VARIANT_KEY);
Expand Down Expand Up @@ -98,4 +98,4 @@ private static Optional<String> getVariantValueFromReferer(final String refererV

return Optional.empty();
}
}
}
10 changes: 6 additions & 4 deletions dotCMS/src/main/java/com/dotcms/variant/business/web/VariantWebAPIImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,19 +66,21 @@ public String currentVariantId() {
}
}

setSessionAttribute(request, currentVariantName);
setSessionAttributeIfNeeded(request, currentVariantName);
return currentVariantName;
}

private static void setSessionAttribute(final HttpServletRequest request,
private static void setSessionAttributeIfNeeded(final HttpServletRequest request,
final String currentVariantName) {

final HttpSession session = request.getSession(true);
boolean buildSessionIfNeeded = !"DEFAULT".equals(currentVariantName);

final HttpSession session = request.getSession(buildSessionIfNeeded);

if (!UtilMethods.isSet(session)) {
return;
}

final Object attribute = session.getAttribute(VariantAPI.VARIANT_KEY);

if (mustOverwrite(attribute, currentVariantName)) {
Expand Down