return null if list.pop has no results

evantahler · Feb 28, 2016 · b742bf1 · b742bf1
1 parent 1a04a50
commit b742bf1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/initializers/cache.js b/initializers/cache.js
@@ -215,6 +215,7 @@ module.exports = {
     api.cache.pop = function(key, next){
       api.redis.client.lpop(api.cache.redisPrefix + key, function(err, object){
         if(err){ return next(err); }
+        if(!object){ return next(); }
         var item = JSON.parse(object);
         return next(null, item.data);
       });

diff --git a/test/core/cache.js b/test/core/cache.js
@@ -232,6 +232,14 @@ describe('Core: Cache', function(){
       });
     });
 
+    it('will return null if the list is empty', function(done){
+      api.cache.pop('emptyListKey', function(error, data){
+        should.not.exist(error);
+        should.not.exist(data);
+        done();
+      });
+    });
+
     it('can get the length of an array when full', function(done){
       api.cache.push('testListKey2', 'a string', function(){
         api.cache.listLength('testListKey2', function(error, l){