From b47cc56a86f0664e18ad75cef81ef44c592704a6 Mon Sep 17 00:00:00 2001
From: Rene Pfeuffer <rene.pfeuffer@cloudogu.com>
Date: Wed, 6 Nov 2019 08:32:00 +0100
Subject: [PATCH 1/2] Remove redundant logging

---
 .../java/sonia/scm/security/XsrfAccessTokenEnricher.java     | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/security/XsrfAccessTokenEnricher.java b/scm-webapp/src/main/java/sonia/scm/security/XsrfAccessTokenEnricher.java
index ed7093c09c..47166709c2 100644
--- a/scm-webapp/src/main/java/sonia/scm/security/XsrfAccessTokenEnricher.java
+++ b/scm-webapp/src/main/java/sonia/scm/security/XsrfAccessTokenEnricher.java
@@ -82,8 +82,6 @@ public class XsrfAccessTokenEnricher implements AccessTokenEnricher {
     if (configuration.isEnabledXsrfProtection()) {
       if (isEnrichable()) {
         builder.custom(Xsrf.TOKEN_KEY, createToken());
-      } else {
-        LOG.trace("skip xsrf enrichment, because jwt session is started from a non wui client");
       }
     } else {
       LOG.trace("xsrf is disabled, skip xsrf enrichment");
@@ -98,15 +96,16 @@ public class XsrfAccessTokenEnricher implements AccessTokenEnricher {
         return true;
       } else {
         LOG.trace("skip xsrf enrichment, because jwt session is started from a non wui client");
+        return false;
       }
     } catch (ProvisionException ex) {
       if (ex.getCause() instanceof OutOfScopeException) {
         LOG.trace("skip xsrf enrichment, because no request scope is available");
+        return false;
       } else {
         throw ex;
       }
     }
-    return false;
   }
 
   @VisibleForTesting

From 2826273719b8b31c65ff3ea69e903bbcbc277829 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Wed, 6 Nov 2019 08:06:26 +0000
Subject: [PATCH 2/2] Close branch feature/remove_redundant_logging