[BACKLOG-39705] Remove from Region Cache not removing 1st level cache…

… entry.
pentaho · Jan 30, 2024 · 32793d4 · 32793d4
1 parent 7c88769
commit 32793d4
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java b/extensions/src/main/java/org/pentaho/platform/plugin/services/cache/CacheManager.java
@@ -400,7 +400,10 @@ public Set getAllEntriesFromRegionCache( String region ) {
   public void removeFromRegionCache( String region, Object key ) {
     if ( checkRegionEnabled( region ) ) {
       HvCache hvcache = (HvCache) regionCache.get( region );
-      hvcache.evictEntityData( (String) key );
+      try ( SessionImpl session = (SessionImpl) hvcache.getSessionFactory().openSession() ) {
+        hvcache.getStorageAccess().removeFromCache( key, session );
+        hvcache.evictEntityData( (String) key );
+      }
     } else {
       CacheManager.logger.warn( Messages.getInstance().getString(
         "CacheManager.WARN_0003_REGION_DOES_NOT_EXIST", region ) ); //$NON-NLS-1$