Clear cache before watch callbacks when pruning

Doing the cache clear / watch callbacks in one go was causing issues for NAT, and didn't make sense. Signed-off-by: carlgsmith <[email protected]>
alliedtelesis · Jan 5, 2015 · 188e178 · 188e178
1 parent 273dd22
commit 188e178
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/apteryxd.c b/apteryxd.c
@@ -814,13 +814,17 @@ apteryx__prune (Apteryx__Server_Service *service,
     closure (&result, closure_data);
 
     /* Call watchers for each pruned path */
+#ifdef USE_SHM_CACHE
     for (iter = paths; iter; iter = g_list_next (iter))
     {
-#ifdef USE_SHM_CACHE
         cache_set ((const char *) iter->data, NULL, 0);
+    }
 #endif
+    for (iter = paths; iter; iter = g_list_next (iter))
+    {
         notify_watchers ((const char *) iter->data);
     }
+
     g_list_free_full (paths, free);
     return;
 }