From 5e70ceda1b3d54e6e11fc79830c9df460f89e7c8 Mon Sep 17 00:00:00 2001
From: mvdbeek <m.vandenbeek@gmail.com>
Date: Mon, 4 Apr 2022 20:38:30 +0200
Subject: [PATCH] Fix non-extended variant of fetch_data task

---
 lib/galaxy/jobs/__init__.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/galaxy/jobs/__init__.py b/lib/galaxy/jobs/__init__.py
index 134d8960405..b84f7a3931a 100644
--- a/lib/galaxy/jobs/__init__.py
+++ b/lib/galaxy/jobs/__init__.py
@@ -1628,6 +1628,8 @@ class JobWrapper(HasResourceParameters):
             except Exception as e:
                 # TODO ... error handler on task / chain level ?
                 self.fail(message=str(e))
+            # Reset the Null Metadata. That would normally happen because the finish context rebuilds another JobWrapper instance.
+            self.tool_provided_job_metadata = None
             self.finish(tool_stdout="", tool_stderr="")
             return False
         self.sa_session.flush()