From 5a648671d3e660cde5420322e0835417003a09cf Mon Sep 17 00:00:00 2001
From: Jonathan Shook <jshook@gmail.com>
Date: Tue, 31 Jan 2023 23:00:07 -0600
Subject: [PATCH] nosqlbench-968 Scenario shutdown hook not being unregistered
 correctly

---
 .../nosqlbench/engine/core/lifecycle/scenario/Scenario.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
index 186b25ad0..55a3d82fc 100644
--- a/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
+++ b/engine-core/src/main/java/io/nosqlbench/engine/core/lifecycle/scenario/Scenario.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 nosqlbench
+ * Copyright (c) 2022-2023 nosqlbench
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -277,8 +277,10 @@ public class Scenario implements Callable<ExecutionMetricsResult> {
         }
 
         Runtime.getRuntime().removeShutdownHook(scenarioShutdownHook);
-        scenarioShutdownHook.run();
+        var runHook = scenarioShutdownHook;
         scenarioShutdownHook = null;
+        runHook.run();
+        logger.debug("removing scenario shutdown hook");
     }
 
     public void notifyException(Thread t, Throwable e) {