diff --git a/dspace-api/src/main/java/org/dspace/core/Context.java b/dspace-api/src/main/java/org/dspace/core/Context.java
index 82b39dd2dfc7..03cf8538f181 100644
--- a/dspace-api/src/main/java/org/dspace/core/Context.java
+++ b/dspace-api/src/main/java/org/dspace/core/Context.java
@@ -176,11 +176,16 @@ protected void init() {
             if (dbConnection == null) {
                 log.fatal("Cannot obtain the bean which provides a database connection. " +
                               "Check previous entries in the dspace.log to find why the db failed to initialize.");
-            }
-        }
-
-        currentUser = null;
-        currentLocale = I18nUtil.getDefaultLocale();
+<<<<<<< HEAD
+=======
+            } else {
+                if (isTransactionAlive()) {
+                    log.debug("Initializing a context while an active transaction exists. Context with hash: {}.",
+            } else {
+                if (isTransactionAlive()) {
+                    log.debug("Initializing a context while an active transaction exists. Context with hash: {}.",
+                              getHash());
+                }
         extraLogInfo = "";
         ignoreAuth = false;