From f3f18eedc6f4ecef82c694a2aa97552ab3fa8519 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Mon, 4 May 2020 06:48:08 +0200
Subject: [PATCH] OO-4487: update hibernate, remove log...
---
pom.xml | 4 ++--
.../java/org/olat/admin/sysinfo/UserSessionController.java | 4 +++-
.../core/commons/fullWebApp/BaseFullWebappController.java | 2 --
.../olat/modules/assessment/manager/AssessmentEntryDAO.java | 2 ++
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5f9d166e2bf..455e72dcc79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,8 +62,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<targetJdk>1.8</targetJdk>
- <org.springframework.version>5.2.5.RELEASE</org.springframework.version>
- <org.hibernate.version>5.4.14.Final</org.hibernate.version>
+ <org.springframework.version>5.2.6.RELEASE</org.springframework.version>
+ <org.hibernate.version>5.4.15.Final</org.hibernate.version>
<apache.cxf>3.3.6</apache.cxf>
<apache.pdfbox>2.0.19</apache.pdfbox>
<apache.poi>4.1.2</apache.poi>
diff --git a/src/main/java/org/olat/admin/sysinfo/UserSessionController.java b/src/main/java/org/olat/admin/sysinfo/UserSessionController.java
index dd7aa279166..867c5f58991 100644
--- a/src/main/java/org/olat/admin/sysinfo/UserSessionController.java
+++ b/src/main/java/org/olat/admin/sysinfo/UserSessionController.java
@@ -116,7 +116,9 @@ public class UserSessionController extends BasicController implements Breadcrumb
Collection<UserSession> authUserSessions = sessionManager.getAuthenticatedUserSessions();
List<UserSessionView> authUserSessionViews = new ArrayList<>(authUserSessions.size());
for(UserSession authUserSession:authUserSessions) {
- authUserSessionViews.add(new UserSessionView(authUserSession));
+ if(authUserSession != null) {
+ authUserSessionViews.add(new UserSessionView(authUserSession));
+ }
}
usessTableModel = new UserSessionTableModel(authUserSessionViews, getIdentity().getKey());
tableCtr.setTableDataModel(usessTableModel);
diff --git a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
index f9b257f04a8..8557ae088e5 100644
--- a/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
+++ b/src/main/java/org/olat/core/commons/fullWebApp/BaseFullWebappController.java
@@ -249,8 +249,6 @@ public class BaseFullWebappController extends BasicController implements DTabs,
// ------ all the frame preparation is finished ----
initializeBase(ureq, initialPanel);
- logAudit("BaseFullWebappController: " + usess.getEntry(PRESENTED_AFTER_LOGIN_WORKFLOW));
-
if(usess.isAuthenticated() && !isAdmin && usess.getAssessmentModes() != null && !usess.getAssessmentModes().isEmpty()) {
assessmentGuardCtrl = new AssessmentModeGuardController(ureq, getWindowControl(),
usess.getAssessmentModes(), false);
diff --git a/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java b/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
index 23985c1d1fc..679fefcabff 100644
--- a/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
+++ b/src/main/java/org/olat/modules/assessment/manager/AssessmentEntryDAO.java
@@ -24,6 +24,7 @@ import java.util.Collections;
import java.util.Date;
import java.util.List;
+import javax.persistence.FlushModeType;
import javax.persistence.TypedQuery;
import org.olat.basesecurity.Group;
@@ -430,6 +431,7 @@ public class AssessmentEntryDAO {
.createQuery(sb.toString(), AssessmentEntryScoring.class)
.setParameter("identityKey", assessedIdentity.getKey())
.setParameter("entryKeys", entryKeys)
+ .setFlushMode(FlushModeType.COMMIT)
.getResultList();
}
--
GitLab