From 7af76099d01efd3727ad0407688fbb2212af5c45 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 30 Jan 2014 10:41:42 +0100
Subject: [PATCH] OO-954: re-init the activity logger in the shibboleth
 dispatcher

---
 src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java b/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
index 40412c27494..ae5069cd160 100644
--- a/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
+++ b/src/main/java/org/olat/shibboleth/ShibbolethDispatcher.java
@@ -55,6 +55,7 @@ import org.olat.core.logging.OLATRuntimeException;
 import org.olat.core.logging.OLATSecurityException;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.logging.activity.ThreadLocalUserActivityLoggerInstaller;
 import org.olat.core.util.Util;
 import org.olat.core.util.WebappHelper;
 import org.olat.core.util.i18n.I18nModule;
@@ -144,6 +145,10 @@ public class ShibbolethDispatcher implements Dispatcher{
 			redirectToShibbolethRegistration(resp);
 			return;
 		}
+		if(ureq.getUserSession() != null) {
+			//re-init the activity logger
+			ThreadLocalUserActivityLoggerInstaller.initUserActivityLogger(req);
+		}
 		int loginStatus = AuthHelper.doLogin(auth.getIdentity(), ShibbolethDispatcher.PROVIDER_SHIB, ureq);
 		if (loginStatus != AuthHelper.LOGIN_OK) {
 			if (loginStatus == AuthHelper.LOGIN_NOTAVAILABLE) {
-- 
GitLab