Merge branch 'hotfix/119' into develop, Forward port #119

zendframework · Nov 4, 2016 · 47315eb · 47315eb
2 parents c4c11ed + 2d46e73
commit 47315eb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -41,6 +41,8 @@ All notable changes to this project will be documented in this file, in reverse
 
 ### Fixed
 
+- [#119](https://github.com/zendframework/zend-cache/pull/119)
+  Redis: Don't call method Redis::info() every time
 - [#113](https://github.com/zendframework/zend-cache/pull/113)
   Travis: Moved coverage reporting to latest env
 - [#114](https://github.com/zendframework/zend-cache/pull/114)

diff --git a/src/Storage/Adapter/RedisResourceManager.php b/src/Storage/Adapter/RedisResourceManager.php
@@ -118,7 +118,7 @@ public function getPassword($id)
      * Gets a redis resource
      *
      * @param string $id
-     * @return RedisResourceManager
+     * @return RedisResource
      * @throws Exception\RuntimeException
      */
     public function getResource($id)
@@ -133,8 +133,12 @@ public function getResource($id)
             if (!$resource['initialized']) {
                 $this->connect($resource);
             }
-            $info = $resource['resource']->info();
-            $resource['version'] = $info['redis_version'];
+
+            if (!$resource['version']) {
+                $info = $resource['resource']->info();
+                $resource['version'] = $info['redis_version'];
+            }
+
             return $resource['resource'];
         }