oxcore : fixed bug with cache entity persistence with NativePersistence.

GluuFederation/oxAuth#654
GluuFederation · Aug 9, 2018 · 1562941 · 1562941
1 parent 7742b3b
commit 1562941
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/oxService/src/main/java/org/xdi/service/cache/NativePersistenceCacheProvider.java b/oxService/src/main/java/org/xdi/service/cache/NativePersistenceCacheProvider.java
@@ -116,12 +116,23 @@ public void put(String expirationInSeconds, String key, Object object) {
             entity.setCreationDate(creationDate);
             entity.setExpirationDate(expirationDate.getTime());
 
+            silentlyRemoveEntityIfExists(entity);
             ldapEntryManager.persist(entity);
         } catch (Exception e) {
             log.trace("Failed to put entry, key: " + originalKey + ", hashedKey: " + key + ", message: " + e.getMessage(), e); // log as trace since it is perfectly valid that entry is removed by timer for example
         }
     }
 
+    private void silentlyRemoveEntityIfExists(NativePersistenceCacheEntity entity) {
+        try {
+            if (ldapEntryManager.find(NativePersistenceCacheEntity.class, entity.getDn()) != null) {
+                ldapEntryManager.removeWithSubtree(entity.getDn());
+            }
+        } catch (Exception e) {
+            // ignore
+        }
+    }
+
     private static boolean isExpired(Date expiredAt) {
         return expiredAt == null || expiredAt.before(new Date());
     }