Changeset 2114

Timestamp:

10/07/07 14:46:55 (15 months ago)

Author:

david

Message:

Do not store global request data copy in serialized execution containers, and restore current global request data if possible on wakeup. Refs #544

Files:

• branches/0.11/src/controller/AgaviExecutionContainer.class.php (modified) (2 diffs)

branches/0.11/src/controller/AgaviExecutionContainer.class.php

@@ -115 +115 @@
     $this->outputTypeName = $this->outputType->getName();
     $arr = get_object_vars($this);
-    unset($arr['context'], $arr['outputType']);
+    unset($arr['context'], $arr['outputType'], $arr['requestData']);
     return array_keys($arr);
   }
@@ -132 +132 @@
     $this->context = AgaviContext::getInstance($this->contextName);
     $this->outputType = $this->context->getController()->getOutputType($this->outputTypeName);
+    $rq = $this->context->getRequest();
+    if($rq->isLocked()) {
+      $this->requestData = new AgaviRequestDataHolder();
+    } else {
+      $this->requestData = $rq->getRequestData();
+    }
     unset($this->contextName, $this->outputTypeName);
   }