1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/at/gv/egiz/moazs/App2MzsService.java b/src/main/java/at/gv/egiz/moazs/App2MzsService.java
index 2f06f7b..f8c00fc 100644
--- a/src/main/java/at/gv/egiz/moazs/App2MzsService.java
+++ b/src/main/java/at/gv/egiz/moazs/App2MzsService.java
@@ -2,6 +2,8 @@ package at.gv.egiz.moazs;
 
 import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs.App2MzsPortType;
 import at.gv.e_government.reference.namespace.zustellung.mzs.app2mzs_.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,6 +18,8 @@ import static java.util.concurrent.CompletableFuture.supplyAsync;
 @Service
 public class App2MzsService implements App2MzsPortType {
 
+    private static final Logger logger = LoggerFactory.getLogger(App2MzsService.class);
+
     //TODO move timeout to config
     private final int timeoutForAnwser = 10;
     private final String MZSTNS = "http://reference.e-government.gv.at/namespace/zustellung/mzs/app2mzs#";
@@ -40,14 +44,16 @@ public class App2MzsService implements App2MzsPortType {
 
         try {
             return future.get(timeoutForAnwser, TimeUnit.SECONDS);
-
-        } catch (InterruptedException | ExecutionException e) {
-            return generateErrorResponse();
-
         } catch (TimeoutException e) {
             future.thenAccept(appClient::sendNotification);
+            logger.warn("Answer Timed Out", e);
             return generatePartialSuccessResponse(deliveryRequest);
+
+        } catch (Exception e ) {
+            logger.error("Could not deliver request.", e);
+            return generateErrorResponse();
         }
+
     }
 
     private DeliveryResponseType generatePartialSuccessResponse(DeliveryRequestType deliveryRequest) {