More bug fix and refactoring

[dmaap/datarouter.git] / datarouter-node / src / main / java / org / onap / dmaap / datarouter / node / DeliveryQueue.java

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 e06ec5a..d447bcc 100644 (file)
--- 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
@@ -82,6 +82,16 @@ public class DeliveryQueue implements Runnable, DeliveryTaskHelper {
     private File dir;
     private List<DeliveryTask> todoList = new ArrayList<>();
 
+    /**
+     * Create a delivery queue for a given destination info.
+     */
+    DeliveryQueue(DeliveryQueueHelper deliveryQueueHelper, DestInfo destinationInfo) {
+        this.deliveryQueueHelper = deliveryQueueHelper;
+        this.destinationInfo = destinationInfo;
+        dir = new File(destinationInfo.getSpool());
+        dir.mkdirs();
+    }
+
     /**
      * Try to cancel a delivery task.
      *
@@ -214,29 +224,16 @@ 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);
         }
     }
 
-    /**
-     * Create a delivery queue for a given destination info.
-     */
-    DeliveryQueue(DeliveryQueueHelper deliveryQueueHelper, DestInfo destinationInfo) {
-        this.deliveryQueueHelper = deliveryQueueHelper;
-        this.destinationInfo = destinationInfo;
-        dir = new File(destinationInfo.getSpool());
-        dir.mkdirs();
-    }
-
     /**
      * Update the destination info for this delivery queue.
      */
@@ -449,4 +446,4 @@ public class DeliveryQueue implements Runnable, DeliveryTaskHelper {
         }
         return fname2;
     }
-}
+}
\ No newline at end of file