1 files changed, 8 insertions, 4 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java b/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
index 9f2b6d4..920e90d 100644
--- a/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
+++ b/src/main/java/at/gv/egiz/moazs/pipeline/SameThreadDeliveryPipeline.java
@@ -75,11 +75,12 @@ public class SameThreadDeliveryPipeline implements DeliveryPipeline {
             status = msgClientFactory.create(msgRequest, mzsRequest.getConfig(), interceptor).send();
 
             var signedStatus = repository.getSignedDeliveryRequestStatus(appDeliveryId).get();
-            if (verifier.verify(signedStatus)) {
-                repository.add(status);
-            } else {
+
+            try {
+                verifier.verify(signedStatus);
+            } catch (Exception ex) {
                 throw moaZSExceptionBuilder("Signature of DeliveryRequestStatus with AppDeliveryId={} " +
-                        "is invalid.", appDeliveryId)
+                        " is not valid.", appDeliveryId)
                         .withErrorCode(MoaZSException.ERROR_MOASP_SIGNATURE_INVALID)
                         .withMzsRequest(mzsRequest)
                         .withTnvzResult(tnvzResult)
@@ -87,6 +88,9 @@ public class SameThreadDeliveryPipeline implements DeliveryPipeline {
                         .withMsgResult(status)
                         .build();
             }
+
+            repository.add(status);
+
         } catch (MoaZSException exception) {
             var errorStatus = generateErrorStatus(exception, appDeliveryId);
             repository.add(errorStatus);