getService now also caches the result is an exception is thrown

paynl · May 16, 2018 · d837f4c · d837f4c
1 parent 3690fa1
commit d837f4c
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/src/Api/Transaction/GetService.php b/src/Api/Transaction/GetService.php
@@ -54,14 +54,23 @@ protected function getData()
      */
     public function doRequest($endpoint = null, $version = null)
     {
-        if (isset(self::$cache[Config::getServiceId()])) {
-            Helper::requireApiToken();
-            Helper::requireServiceId();
-            return self::$cache[Config::getServiceId()];
-        }
+        Helper::requireApiToken();
+        Helper::requireServiceId();
 
-        $result = parent::doRequest('transaction/getService');
-        self::$cache[Config::getServiceId()] = $result;
+        $cacheKey = Config::getTokenCode().'|'.Config::getApiToken() . '|' . Config::getServiceId();
+        if (isset(self::$cache[$cacheKey])) {
+            if (self::$cache[$cacheKey] instanceof \Exception) {
+                throw self::$cache[$cacheKey];
+            }
+            return self::$cache[$cacheKey];
+        }
+        try {
+            $result = parent::doRequest('transaction/getService');
+            self::$cache[$cacheKey] = $result;
+        } catch (\Exception $e) {
+            self::$cache[$cacheKey] = $e;
+            throw $e;
+        }
         return $result;
     }
 }