1 files changed, 5 insertions, 8 deletions
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java
index 4d336b73..d447bcc1 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/DeliveryQueue.java
@@ -224,16 +224,13 @@ public class DeliveryQueue implements Runnable, DeliveryTaskHelper {
                 todoindex = 0;
                 todoList = new ArrayList<>();
                 String[] files = dir.list();
-                Arrays.sort(files);
-                scanForNextTask(files);
+                if (files != null) {
+                    Arrays.sort(files);
+                    scanForNextTask(files);
+                }
                 retry = new HashMap<>();
             }
-            DeliveryTask dt = getDeliveryTask(mindate);
-            if (dt != null) {
-                return dt;
-            }
-            return null;
-
+            return getDeliveryTask(mindate);
         }
     }