Merge pull request aws#695 from jeskew/fix/memory-leak

Defer inspection of memoized credential provider
Thinkscape · Jul 17, 2015 · 1a69410 · 1a69410
2 parents 78e2278 + 4a48225
commit 1a69410
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/Credentials/CredentialProvider.php b/src/Credentials/CredentialProvider.php
@@ -122,28 +122,30 @@ public static function chain()
      */
     public static function memoize(callable $provider)
     {
-        // Create the initial promise that will be used as the cached value
-        // until it expires.
-        $result = $provider();
-        $isConstant = false;
+        return function () use ($provider) {
+            static $result;
+            static $isConstant;
 
-        return function () use (&$result, &$isConstant, $provider) {
             // Constant credentials will be returned constantly.
             if ($isConstant) {
                 return $result;
             }
 
-            // Determine if these are constant credentials.
-            if ($result->getState() === Promise\PromiseInterface::FULFILLED
-                && !$result->wait()->getExpiration()
-            ) {
-                $isConstant = true;
-                return $result;
+            // Create the initial promise that will be used as the cached value
+            // until it expires.
+            if (null === $result) {
+                $result = $provider();
             }
 
             // Return credentials that could expire and refresh when needed.
             return $result
-                ->then(function (CredentialsInterface $creds) use ($provider, &$result) {
+                ->then(function (CredentialsInterface $creds) use ($provider, &$isConstant, &$result) {
+                    // Determine if these are constant credentials.
+                    if (!$creds->getExpiration()) {
+                        $isConstant = true;
+                        return $creds;
+                    }
+
                     // Refresh expired credentials.
                     if (!$creds->isExpired()) {
                         return $creds;