Fix NPE due to different execution times

camunda-community-hub · Jun 10, 2024 · a006214 · a006214
1 parent c7c241f
commit a006214
Showing 1 changed file with 8 additions and 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
@@ -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;