Update Scylla cache implementation

freshdesk · Oct 23, 2024 · f468b8c · f468b8c
1 parent 3b443df
commit f468b8c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...nce/src/main/java/com/netflix/conductor/scylla/config/cache/CacheableEventHandlerDAO.java b/...nce/src/main/java/com/netflix/conductor/scylla/config/cache/CacheableEventHandlerDAO.java
@@ -68,13 +68,19 @@ public void scheduleEventHandlerRefresh() {
     }
 
     @Override
-    @CachePut(value = EVENT_HANDLER_CACHE, key = "#eventHandler.name")
+    @CachePut(
+            value = EVENT_HANDLER_CACHE,
+            key = "#eventHandler.name",
+            condition = "#eventHandler != null")
     public void addEventHandler(EventHandler eventHandler) {
         scyllaEventHandlerDAO.addEventHandler(eventHandler);
     }
 
     @Override
-    @CachePut(value = EVENT_HANDLER_CACHE, key = "#eventHandler.name")
+    @CachePut(
+            value = EVENT_HANDLER_CACHE,
+            key = "#eventHandler.name",
+            condition = "#eventHandler != null")
     public void updateEventHandler(EventHandler eventHandler) {
         scyllaEventHandlerDAO.updateEventHandler(eventHandler);
     }

diff --git a/...istence/src/main/java/com/netflix/conductor/scylla/config/cache/CacheableMetadataDAO.java b/...istence/src/main/java/com/netflix/conductor/scylla/config/cache/CacheableMetadataDAO.java
@@ -72,14 +72,14 @@ public void scheduleCacheRefresh() {
     }
 
     @Override
-    @CachePut(value = TASK_DEF_CACHE, key = "#taskDef.name")
+    @CachePut(value = TASK_DEF_CACHE, key = "#taskDef.name", condition = "#taskDef != null")
     public TaskDef createTaskDef(TaskDef taskDef) {
         scyllaMetadataDAO.createTaskDef(taskDef);
         return taskDef;
     }
 
     @Override
-    @CachePut(value = TASK_DEF_CACHE, key = "#taskDef.name")
+    @CachePut(value = TASK_DEF_CACHE, key = "#taskDef.name", condition = "#taskDef != null")
     public TaskDef updateTaskDef(TaskDef taskDef) {
         return scyllaMetadataDAO.updateTaskDef(taskDef);
     }