svnno****@sourc*****
svnno****@sourc*****
2010年 1月 13日 (水) 14:09:32 JST
Revision: 775
http://sourceforge.jp/projects/p2-php/svn/view?view=rev&revision=775
Author: rsk
Date: 2010-01-13 14:09:32 +0900 (Wed, 13 Jan 2010)
Log Message:
-----------
expack:
- 書き込みができない不具合を修正。
Modified Paths:
--------------
p2ex/trunk/lib/P2Client.php
p2ex/trunk/lib/P2KeyValueStore/Result.php
p2ex/trunk/lib/P2KeyValueStore.php
-------------- next part --------------
Modified: p2ex/trunk/lib/P2Client.php
===================================================================
--- p2ex/trunk/lib/P2Client.php 2010-01-13 04:45:11 UTC (rev 774)
+++ p2ex/trunk/lib/P2Client.php 2010-01-13 05:09:32 UTC (rev 775)
@@ -1,7 +1,7 @@
<?php
require_once 'HTTP/Client.php';
require_once dirname(__FILE__) . '/P2DOM.php';
-require_once dirname(__FILE__) . '/P2KeyValueStore/Serializing.php';
+require_once dirname(__FILE__) . '/P2KeyValueStore.php';
// {{{ P2Client
Modified: p2ex/trunk/lib/P2KeyValueStore/Result.php
===================================================================
--- p2ex/trunk/lib/P2KeyValueStore/Result.php 2010-01-13 04:45:11 UTC (rev 774)
+++ p2ex/trunk/lib/P2KeyValueStore/Result.php 2010-01-13 05:09:32 UTC (rev 775)
@@ -50,9 +50,9 @@
public function isExpired($lifeTime)
{
if ($lifeTime > -1 && $this->mtime < time() - $lifeTime) {
+ return true;
+ } else {
return false;
- } else {
- return true;
}
}
Modified: p2ex/trunk/lib/P2KeyValueStore.php
===================================================================
--- p2ex/trunk/lib/P2KeyValueStore.php 2010-01-13 04:45:11 UTC (rev 774)
+++ p2ex/trunk/lib/P2KeyValueStore.php 2010-01-13 05:09:32 UTC (rev 775)
@@ -336,7 +336,7 @@
if ($row === false) {
return false;
- } elseif ($row->isExpired()) {
+ } elseif ($row->isExpired($lifeTime)) {
$this->deleteById($row->id);
return false;
} else {
@@ -366,7 +366,7 @@
if ($row === false) {
return null;
- } elseif ($row->isExpired()) {
+ } elseif ($row->isExpired($lifeTime)) {
$this->deleteById($id);
return null;
} else {
@@ -398,7 +398,7 @@
if ($row === false) {
return null;
- } elseif ($row->isExpired()) {
+ } elseif ($row->isExpired($lifeTime)) {
$this->deleteById($row->id);
return null;
} else {