From ad6c57f5ff196fd2744c64d74f0ce4e9c0829870 Mon Sep 17 00:00:00 2001
From: Sailesh Mukil <smukil@netflix.com>
Date: Fri, 15 Nov 2019 15:44:45 -0800
Subject: [PATCH] Fix null return from popMsgWithPredicateObeyPriority

---
 .../main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java b/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java
index c28e29c..fb0825e 100644
--- a/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java
+++ b/dyno-queues-redis/src/main/java/com/netflix/dyno/queues/redis/RedisDynoQueue.java
@@ -921,6 +921,7 @@ private Message popMsgWithPredicateObeyPriority(String predicate, boolean localS
                     Collections.singletonList(messageStoreKey), builder.build());
         }
 
+        if (retval.size() == 0) return null;
         return new Message(retval.get(0), retval.get(1));
 
     }