1 files changed, 34 insertions, 16 deletions
diff --git a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
index 84753408..b1f45801 100644
--- a/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
+++ b/eaaf_core/src/main/java/at/gv/egiz/eaaf/core/impl/idp/auth/services/ProtocolAuthenticationService.java
@@ -328,29 +328,47 @@ public class ProtocolAuthenticationService implements IProtocolAuthenticationSer
   }
 
   private void logExceptionToTechnicalLog(IHandleData errorData) {
-    // In case of a TaskExecutionException, which is only a container for
-    // process-errors,
-    // extract internal exception
+    if (errorData.isWriteThrowable()) {
+      if (!(errorData.getThrowable() instanceof EaafException)
+          || LogLevel.ERROR.equals(errorData.getLogLevel())) {
+        log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
 
-    // Log exception
-    if (!(errorData.getThrowable() instanceof EaafException)
-        || LogLevel.ERROR.equals(errorData.getLogLevel())) {
-      log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+      } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
+        log.warn(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
 
-    } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
-      log.warn(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+      } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
+        log.info(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
 
-    } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
-      log.info(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+      } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
+        log.debug(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
 
-    } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
-      log.debug(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+      } else {
+        log.warn("Get unsupported LogLevelType: {}. Use {} as default",
+            errorData.getLogLevel(), LogLevel.ERROR);
+        log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+
+      }
 
     } else {
-      log.warn("Get unsupported LogLevelType: {}. Use {} as default",
-          errorData.getLogLevel(), LogLevel.ERROR);
-      log.error(errorData.getPreFormatedErrorMessage(), errorData.getThrowable());
+      if (!(errorData.getThrowable() instanceof EaafException)
+          || LogLevel.ERROR.equals(errorData.getLogLevel())) {
+        log.error(errorData.getPreFormatedErrorMessage());
+
+      } else if (LogLevel.WARN.equals(errorData.getLogLevel())) {
+        log.warn(errorData.getPreFormatedErrorMessage());
+
+      } else if (LogLevel.INFO.equals(errorData.getLogLevel())) {
+        log.info(errorData.getPreFormatedErrorMessage());
 
+      } else if (LogLevel.DEBUG.equals(errorData.getLogLevel())) {
+        log.debug(errorData.getPreFormatedErrorMessage());
+
+      } else {
+        log.warn("Get unsupported LogLevelType: {}. Use {} as default",
+            errorData.getLogLevel(), LogLevel.ERROR);
+        log.error(errorData.getPreFormatedErrorMessage());
+
+      }
     }
   }