From 9bbdb34fb6f0676675851691280f261a3f37bb9e Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Wed, 19 Dec 2018 12:41:55 -0500
Subject: [PATCH] Remove unneeded session flushes and adds when collecting
 primary datasets.

---
 lib/galaxy/tools/parameters/output_collect.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/galaxy/tools/parameters/output_collect.py b/lib/galaxy/tools/parameters/output_collect.py
index a30429b5c2c..5bdd62c061f 100644
--- a/lib/galaxy/tools/parameters/output_collect.py
+++ b/lib/galaxy/tools/parameters/output_collect.py
@@ -631,8 +631,6 @@ def collect_primary_datasets(tool, output, tool_provided_metadata, job_working_d
             else:
                 primary_data.set_meta()
             primary_data.set_peek()
-            sa_session.add(primary_data)
-            sa_session.flush()
             outdata.history.add_dataset(primary_data)
             # Add dataset to return dict
             primary_datasets[name][designation] = primary_data
@@ -651,7 +649,8 @@ def collect_primary_datasets(tool, output, tool_provided_metadata, job_working_d
             outdata.set_meta()
             outdata.set_peek()
             sa_session.add(outdata)
-            sa_session.flush()
+
+    sa_session.flush()
     return primary_datasets