Page MenuHomePhabricator
Files F14110999

D21072.diff
No OneTemporary
Actions

D21072.diff
View Options

diff --git a/src/conduit/ArcanistConduitCall.php b/src/conduit/ArcanistConduitCall.php
--- a/src/conduit/ArcanistConduitCall.php
+++ b/src/conduit/ArcanistConduitCall.php
@@ -66,8 +66,6 @@
$this->newFuture();
}
- $this->getEngine()->resolveFuture($this->getKey());
-
return $this->resolveFuture();
}
diff --git a/src/conduit/ArcanistConduitEngine.php b/src/conduit/ArcanistConduitEngine.php
--- a/src/conduit/ArcanistConduitEngine.php
+++ b/src/conduit/ArcanistConduitEngine.php
@@ -5,13 +5,8 @@
private $conduitURI;
private $conduitToken;
-
private $conduitTimeout;
-
private $client;
- private $callKey = 0;
- private $activeFutures = array();
- private $resolvedFutures = array();
public function isCallable() {
return ($this->conduitURI !== null);
@@ -49,10 +44,7 @@
$this->raiseURIException();
}
- $next_key = ++$this->callKey;
-
return id(new ArcanistConduitCall())
- ->setKey($next_key)
->setEngine($this)
->setMethod($method)
->setParameters($parameters);
@@ -67,7 +59,7 @@
$parameters = $call->getParameters();
$future = $this->getClient()->callMethod($method, $parameters);
- $this->activeFutures[$call->getKey()] = $future;
+
return $future;
}
@@ -91,30 +83,6 @@
return $client;
}
- public function resolveFuture($key) {
- if (isset($this->resolvedFutures[$key])) {
- return;
- }
-
- if (!isset($this->activeFutures[$key])) {
- throw new Exception(
- pht(
- 'No future with key "%s" is present in pool.',
- $key));
- }
-
- $iterator = new FutureIterator($this->activeFutures);
- foreach ($iterator as $future_key => $future) {
- $this->resolvedFutures[$future_key] = $future;
- unset($this->activeFutures[$future_key]);
- if ($future_key == $key) {
- break;
- }
- }
-
- return;
- }
-
private function raiseURIException() {
$list = id(new PhutilConsoleList())
->addItem(

File Metadata

Mime Type
text/plain
Expires
Thu, Nov 28, 7:54 PM (20 h, 24 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6802012
Default Alt Text
D21072.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility