feature/IVYPORTAL-18050-Create-cache-mechanism-for-dashboard-converte…

…r-to-enhance-performance
axonivy-market · Dec 17, 2024 · 09202c5 · 09202c5
1 parent f8ca4eb
commit 09202c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java b/AxonIvyPortal/portal/src/ch/addon/portal/generic/menu/MenuView.java
@@ -268,7 +268,7 @@ public PortalDashboardItemWrapper getDashboardCache() {
     }
 
     if (portalDashboardItemWrapper == null) {
-      synchronized (PortalDashboardItemWrapper.class) {
+      synchronized (this) {
         portalDashboardItemWrapper = new PortalDashboardItemWrapper(DashboardUtils.collectDashboards());
         cacheService.setSessionCache(IvyCacheIdentifier.PORTAL_DASHBOARDS, sessionUserId, portalDashboardItemWrapper);
       }

diff --git a/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java b/AxonIvyPortal/portal/src/ch/ivy/addon/portalkit/util/DashboardUtils.java
@@ -66,7 +66,7 @@ public static List<Dashboard> getPublicDashboards() {
     }
 
     if (portalPublicDashboardWrapper == null) {
-      synchronized (PortalPublicDashboardWrapper.class) {
+      synchronized (sessionUserId.intern()) {
         List<Dashboard> dashboards = new ArrayList<>();
         try {
           String dashboardJson = Ivy.var().get(PortalVariable.DASHBOARD.key);
@@ -100,7 +100,7 @@ public static List<Dashboard> getPrivateDashboards() {
     }
 
     if (portalPrivateDashboardWrapper == null) {
-      synchronized (PortalPublicDashboardWrapper.class) {
+      synchronized (sessionUserId.intern()) {
         List<Dashboard> dashboards = new ArrayList<>();
         try {
           String dashboardInUserProperty = readDashboardBySessionUser();