From a006214b070c6dd88f03519f52506878ec24e3d6 Mon Sep 17 00:00:00 2001
From: Stephan Pelikan <stephan.pelikan@phactum.at>
Date: Mon, 10 Jun 2024 15:33:39 +0200
Subject: [PATCH] Fix NPE due to different execution times

---
 .../camunda8/service/Camunda8TransactionAspect.java  | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/spring-boot/src/main/java/io/vanillabp/camunda8/service/Camunda8TransactionAspect.java b/spring-boot/src/main/java/io/vanillabp/camunda8/service/Camunda8TransactionAspect.java
index ee072d6..5a25645 100644
--- a/spring-boot/src/main/java/io/vanillabp/camunda8/service/Camunda8TransactionAspect.java
+++ b/spring-boot/src/main/java/io/vanillabp/camunda8/service/Camunda8TransactionAspect.java
@@ -84,11 +84,13 @@ private Object checkForTransaction(
                 }
             }
             if (actions.get().bpmnErrorCommand != null) {
+                final var runnable = actions.get().handlerFailedCommand.getKey();
+                final var description = actions.get().handlerFailedCommand.getValue();
                 publisher.publishEvent(
                         new Camunda8TransactionProcessor.Camunda8CommandAfterTx(
                                 methodSignature,
-                                () -> actions.get().bpmnErrorCommand.getKey().accept(taskError),
-                                () -> actions.get().bpmnErrorCommand.getValue().apply(taskError)));
+                                () -> runnable.accept(taskError),
+                                () -> description.apply(taskError)));
             }
             return null;
 
@@ -105,11 +107,13 @@ private Object checkForTransaction(
                 }
             }
             if (actions.get().handlerFailedCommand != null) {
+                final var runnable = actions.get().handlerFailedCommand.getKey();
+                final var description = actions.get().handlerFailedCommand.getValue();
                 publisher.publishEvent(
                         new Camunda8TransactionProcessor.Camunda8CommandAfterTx(
                                 methodSignature,
-                                () -> actions.get().handlerFailedCommand.getKey().accept(e),
-                                () -> actions.get().handlerFailedCommand.getValue().apply(e)));
+                                () -> runnable.accept(e),
+                                () -> description.apply(e)));
             }
             throw e;