Skip to content

fix: variable sites shared across concurrent requests #2736

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
boriskole wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

fix: variable sites shared across concurrent requests #2736

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56c494f
fix: variable sites shared across concurrent requests
boriskole Jun 8, 2026
b603419
fix: initialized the sites variable with Collections.emptyList()
boriskole Jun 8, 2026
4faa135
fix: added import for java.util.Collections
boriskole Jun 8, 2026
c3cfb5f
Merge branch 'develop' into fix/2647-sites-variable-shared-across-con…
yingbull Jun 11, 2026
8087d4e
Merge branch 'develop' into fix/2647-sites-variable-shared-across-con…
Ben-Heerema Jun 11, 2026
514ce1f
Merge branch 'develop' into fix/2647-sites-variable-shared-across-con…
Ben-Heerema Jun 11, 2026
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
9 changes: 5 additions & 4 deletions src/main/webapp/WEB-INF/jsp/schedule/schedulecreatedate.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@
--%>
<%!
//multisite starts =====================
private List<Site> sites;
private boolean bMultisites = io.github.carlos_emr.carlos.commn.IsPropertiesOn.isMultisitesEnable();

private String getSiteHTML(String reason, List<Site> sites) {
Comment thread
yingbull marked this conversation as resolved.
if (reason == null || reason.trim().length() == 0)
return "";
Expand All @@ -41,6 +38,10 @@
}
%>
<%

List<Site> sites = java.util.Collections.emptyList();
boolean bMultisites = io.github.carlos_emr.carlos.commn.IsPropertiesOn.isMultisitesEnable();

if (bMultisites) {
SiteDao siteDao = (SiteDao) WebApplicationContextUtils.getWebApplicationContext(application).getBean(SiteDao.class);
sites = siteDao.getAllSites();
Expand Down Expand Up @@ -388,7 +389,7 @@

%>
<c:set var="__enc_1"><carlos:encode value='<%= provider_no %>' context="uriComponent"/></c:set>
<td bgcolor='<%=bgcolor
<td bgcolor='<%=bgcolor
.toString()%>'><a href="#"
Comment thread
boriskole marked this conversation as resolved.
Comment thread
boriskole marked this conversation as resolved.
onclick="popupPage(260,720,'${pageContext.request.contextPath}/schedule/DatePopup?provider_no=<carlos:encode value='${__enc_1}' context="javaScriptAttribute"/>&year=<%=year%>&month=<%=month%>&day=<%=dateGrid[i][j]%>&bFirstDisp=1')">
<font color="red"><%= dateGrid[i][j] %>
Expand Down
Loading