svn commit: r1175169 - /shindig/trunk/php/src/common/Cache.php

[bhofmann]

Author: bhofmann
Date: Sat Sep 24 13:43:49 2011
New Revision: 1175169

URL: http://svn.apache.org/viewvc?rev=1175169&view=rev
Log:
PHP: Added possibility to deactivate caching completely

Modified:
    shindig/trunk/php/src/common/Cache.php

Modified: shindig/trunk/php/src/common/Cache.php
URL: 
http://svn.apache.org/viewvc/shindig/trunk/php/src/common/Cache.php?rev=1175169&r1=1175168&r2=1175169&view=diff
==============================================================================
--- shindig/trunk/php/src/common/Cache.php (original)
+++ shindig/trunk/php/src/common/Cache.php Sat Sep 24 13:43:49 2011
@@ -56,6 +56,9 @@ class Cache {
    * @param RequestTime $time
    */
   private function __construct($cacheClass, $name, RequestTime $time = null) {
+    if ($cacheClass === false) {
+      return;
+    }
     $this->storage = new $cacheClass($name);
     if ($time == null) {
       $this->time = new RequestTime();
@@ -70,6 +73,9 @@ class Cache {
    * @return array or false
    */
   public function get($key) {
+    if (! $this->storage) {
+      return false;
+    }
     if ($this->storage->isLocked($key)) {
       $this->storage->waitForLock($key);
     }
@@ -89,6 +95,9 @@ class Cache {
    * @return array
    */
   public function expiredGet($key) {
+    if (! $this->storage) {
+      return false;
+    }
     if ($this->storage->isLocked($key)) {
       $this->storage->waitForLock($key);
     }
@@ -107,6 +116,9 @@ class Cache {
    * @param int $ttl optional
    */
   public function set($key, $value, $ttl = false) {
+    if (! $this->storage) {
+      return false;
+    }
     if (! $ttl) {
       $ttl = Config::Get('cache_time');
     }
@@ -129,6 +141,9 @@ class Cache {
    * @param string $key
    */
   public function delete($key) {
+    if (! $this->storage) {
+      return false;
+    }  
     if ($this->storage->isLocked($key)) {
       $this->storage->waitForLock($key);
     }
@@ -142,6 +157,9 @@ class Cache {
    * @param string $key
    */
   public function invalidate($key) {
+    if (! $this->storage) {
+      return false;
+    }
     if ($this->storage->isLocked($key)) {
       $this->storage->waitForLock($key);
     }