Merge pull request #221 from brandonsavage/bug709166

Bug 709166 - Adding a flag to check and make sure we are refreshing the data from time to time.
mozilla-services · Dec 14, 2011 · 5177162 · 5177162
2 parents a3ebe1d + 491612a
commit 5177162
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/webapp-php/application/models/branch.php b/webapp-php/application/models/branch.php
@@ -50,6 +50,7 @@ class Branch_Model extends Model {
 
     protected static $_CACHE = array();
     protected $_cache_obj;
+    protected $cache_changed = false;
 
     public function __construct()
     {
@@ -63,7 +64,9 @@ public function __construct()
 
     public function __destruct()
     {
-        $this->_cache_obj->set('branch.cache.objects', self::$_CACHE, NULL, 1800);
+        if($this->cache_changed) {
+            $this->_cache_obj->set('branch.cache.objects', self::$_CACHE, NULL, 1800);
+        }
     }
 
     protected function _getValues(array $order_by = array(), $ignore_cache = false) {
@@ -85,6 +88,7 @@ protected function _getValues(array $order_by = array(), $ignore_cache = false)
         $resp = $service->get("${host}/current/versions/${from}");
         if($order_by && !$ignore_cache) {
             self::$_CACHE[md5($order_by)] = $resp->currentversions;
+            $this->cache_changed = true;
         }
         return $resp->currentversions;
     }