From 569b8413d46e7f4132793f4bc34485233b2cf60f Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Tue, 16 Jan 2018 22:06:57 +0100
Subject: [PATCH] Add extra check so we don't error out on type

json_decode can return false if we have invalid data.
In that case just assume there was nothing cached

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 lib/private/OCS/DiscoveryService.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/OCS/DiscoveryService.php b/lib/private/OCS/DiscoveryService.php
index 53b4d13e797..016331e908f 100644
--- a/lib/private/OCS/DiscoveryService.php
+++ b/lib/private/OCS/DiscoveryService.php
@@ -65,7 +65,10 @@ class DiscoveryService implements IDiscoveryService {
 		// Check the cache first
 		$cacheData = $this->cache->get($remote . '#' . $service);
 		if($cacheData) {
-			return json_decode($cacheData, true);
+			$data = json_decode($cacheData, true);
+			if (\is_array($data)) {
+				return $data;
+			}
 		}
 
 		$discoveredServices = [];