1 files changed, 8 insertions, 4 deletions

diff --git a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java
index 28106377..6ec56825 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java
+++ b/eaaf_modules/eaaf_module_auth_sl20/src/main/java/at/gv/egiz/eaaf/modules/auth/sl20/utils/JsonSecurityUtils.java
@@ -133,6 +133,9 @@ public class JsonSecurityUtils implements IJoseTools {
         log.info("NO SL2.0 authentication security configuration. Initialization was skipped");
       }
 
+    } catch (RuntimeException e) {
+        throw e;  
+   
     } catch (final Exception e) {
       log.error("SL2.0 security constrains initialization FAILED.", e);
 
@@ -304,11 +307,11 @@ public class JsonSecurityUtils implements IJoseTools {
         final List<X509Certificate> sortedX5cCerts = X509Utils.sortCertificates(x5cCerts);
 
         if (!sortedX5cCerts.get(0).equals(encCertChain[0])) {
-          log.info("Certificate from JOSE header does NOT match encryption certificate");
-          log.debug("JOSE certificate: " + sortedX5cCerts.get(0).toString());
+        	log.info("Certificate from JOSE header does NOT match encryption certificate");
 
           try {
-            log.debug("Cert: " + Base64Utils.encode(sortedX5cCerts.get(0).getEncoded()));
+        	  
+            log.debug("JOSE certificate: {}", Base64Utils.encode(sortedX5cCerts.get(0).getEncoded()));
           } catch (final CertificateEncodingException e) {
             e.printStackTrace();
           }
@@ -441,7 +444,8 @@ public class JsonSecurityUtils implements IJoseTools {
         if (cert != null && cert instanceof X509Certificate) {
           result.add((X509Certificate) cert);
         } else {
-          log.info("Can not process entry: " + el + ". Reason: " + cert.toString());
+          log.info("Can not process entry: {}. Reason: {}", el,  
+            cert != null ? cert.getType() : "cert is null");
         }
 
       }