Merge pull request #1640 from NASA-AMMOS/fix/resource-streaming-jobs

Bugfix: Allow resource streaming jobs to finish before closing connections

Author: mattdailis

merlin-worker/src/main/java/gov/nasa/jpl/aerie/merlin/worker/postgres/PostgresProfileStreamer.java

@@ -27,12 +27,12 @@ public void accept(final ResourceProfiles resourceProfiles) {
 
   @Override
   public void close() {
-    queryQueue.shutdown();
-      try {
-          queryHandler.close();
-      } catch (SQLException e) {
-          throw new DatabaseException("Error occurred while attempting to close PostgresProfileQueryHandler", e);
-      }
+    queryQueue.close();  // This waits for all submitted jobs to complete before returning
+    try {
+        queryHandler.close();
+    } catch (SQLException e) {
+        throw new DatabaseException("Error occurred while attempting to close PostgresProfileQueryHandler", e);
+    }
   }
 
 }