From cb2bb1aabe7e7fc3b5ab07cff43c55517a0f29e2 Mon Sep 17 00:00:00 2001
From: James Rouzier <jrouzier@inverse.ca>
Date: Wed, 11 Sep 2013 15:25:57 -0400
Subject: [PATCH] Clear an object internally when retreiving directly from chi

---
 lib/pf/config/cached.pm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lib/pf/config/cached.pm b/lib/pf/config/cached.pm
index 764a77954066..b95703662aca 100644
--- a/lib/pf/config/cached.pm
+++ b/lib/pf/config/cached.pm
@@ -529,12 +529,12 @@ sub _callPostReloadCallbacks {
 
 sub doCallbacks {
     my ($self,$file_reloaded,$cache_reloaded) = @_;
-    my $was_reloaded;
-    if($was_reloaded = $file_reloaded || $cache_reloaded) {
-        $self->_callReloadCallbacks if $was_reloaded;
+    if($file_reloaded || $cache_reloaded) {
+        get_logger()->trace("doing callbacks file_reloaded = " . ($file_reloaded ? 1 : 0) .  "  cache_reloaded = " .  ($cache_reloaded ? 1 : 0));
+        $self->_callReloadCallbacks;
         $self->_callFileReloadCallbacks if $file_reloaded;
         $self->_callCacheReloadCallbacks if $cache_reloaded;
-        $self->_callPostReloadCallbacks if $was_reloaded;
+        $self->_callPostReloadCallbacks;
     }
 }
 
@@ -915,6 +915,8 @@ sub toHash {
 
 sub fromCacheUntainted {
     my ($self,$key) = @_;
+    my $cache = $self->cache;
+    $cache->l1_cache->remove($key);
     return untaint($self->cache->get($key));
 }