cvs: pear /Cache Container.php

dufuz Fri May 25 18:48:19 2007 UTC

Modified files:
/pear/Cache Container.php
Log:
Proper error checking

http://cvs.php.net/viewvc.cgi/pear/C...&diff_format=u
Index: pear/Cache/Container.php
diff -u pear/Cache/Container.php:1.7 pear/Cache/Container.php:1.8
--- pear/Cache/Container.php:1.7 Wed Jan 26 09:47:28 2005
+++ pear/Cache/Container.php Fri May 25 18:48:19 2007
@@ -17,7 +17,7 @@
// | Christian Stocker <chregu@phant.ch> |
// +----------------------------------------------------------------------+
//
-// $Id: Container.php,v 1.7 2005/01/26 09:47:28 dufuz Exp $
+// $Id: Container.php,v 1.8 2007/05/25 18:48:19 dufuz Exp $

require_once 'Cache/Error.php';

@@ -39,7 +39,7 @@
* not recommended!
*
* @author Ulf Wendel <ulf.wendel@phpdoc.de>
-* @version $Id: Container.php,v 1.7 2005/01/26 09:47:28 dufuz Exp $
+* @version $Id: Container.php,v 1.8 2007/05/25 18:48:19 dufuz Exp $
* @package Cache
* @access public
* @abstract
@@ -151,10 +151,15 @@
$this->preload($id, $group);
}
return $this->cachedata;
- } else {
- list( , $data, ) = $this->fetch($id, $group);
- return $data;
}
+
+ $ret = $this->fetch($id, $group);
+ if (PEAR::isError($ret)) {
+ return $ret;
+ }
+
+ list( , $data, ) = $ret;
+ return $data;
} // end func load

/**
@@ -172,10 +177,15 @@
$this->preload($id, $group);
}
return $this->userdata;
- } else {
- list( , , $userdata) = $this->fetch($id, $group);
- return $userdata;
}
+
+ $ret = $this->fetch($id, $group);
+ if (PEAR::isError($ret)) {
+ return $ret;
+ }
+
+ list( , , $userdata) = $ret;
+ return $userdata;
} // end func getUserdata

/**
@@ -202,7 +212,12 @@
return false;
}
// I'm lazy...
- list($this->expires, , ) = $this->fetch($id, $group);
+ $ret = $this->fetch($id, $group);
+ if (PEAR::isError($ret)) {
+ return $ret;
+ }
+
+ list($this->expires, , ) = $ret;
}

// endless
@@ -342,7 +357,11 @@
$this->id = $id;
$this->group = $group;

- list($this->expires, $this->cachedata, $this->userdata) = $this->fetch($id, $group);
+ $ret = $this->fetch($id, $group);
+ if (PEAR::isError($ret)) {
+ return $ret;
+ }
+ list($this->expires, $this->cachedata, $this->userdata) = $ret;

if ($this->expires === null) {
// Uuups, unknown ID