Skip to content

FIX: port offset applied twice when loading WebSite properties (OFBIZ-13352) #949

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
Lukas-Finster wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

FIX: port offset applied twice when loading WebSite properties (OFBIZ-13352) #949

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 framework/webapp/src/main/java/org/apache/ofbiz/webapp/website/WebSiteProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public static WebSiteProperties from(HttpServletRequest request) throws GenericE
Assert.notNull("request", request);
WebSiteProperties webSiteProps = (WebSiteProperties) request.getAttribute("_WEBSITE_PROPS_");
if (webSiteProps == null) {
Boolean addPortoffset = true;
Boolean addPortoffset = false;
Delegator delegator = (Delegator) request.getAttribute("delegator");
if (delegator != null) {
String webSiteId = WebSiteWorker.getWebSiteId(request);
Expand All @@ -94,6 +94,7 @@ public static WebSiteProperties from(HttpServletRequest request) throws GenericE
}
if (webSiteProps == null) {
webSiteProps = new WebSiteProperties(delegator);
addPortoffset = true;
}
if (webSiteProps.getHttpPort().isEmpty() && !request.isSecure()) {
webSiteProps = webSiteProps.updateHttpPort(String.valueOf(request.getServerPort()));
Expand All @@ -103,7 +104,6 @@ public static WebSiteProperties from(HttpServletRequest request) throws GenericE
}
if (webSiteProps.getHttpsPort().isEmpty() && request.isSecure()) {
webSiteProps = webSiteProps.updateHttpsPort(String.valueOf(request.getServerPort()));
addPortoffset = false; // We take the port from the request, don't add the portOffset
}
if (webSiteProps.getHttpsHost().isEmpty()) {
webSiteProps = webSiteProps.updateHttpsHost(request.getServerName());
Expand Down