From 0acf1919e6032df6e040c4a311ea2e110de8f151 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 3 Jan 2014 09:06:41 +0100
Subject: [PATCH] no-jira: fix issue with hibernate 4.3
---
src/main/java/org/olat/instantMessaging/manager/RosterDAO.java | 3 ++-
.../java/org/olat/instantMessaging/model/RosterEntryImpl.java | 3 +--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/instantMessaging/manager/RosterDAO.java b/src/main/java/org/olat/instantMessaging/manager/RosterDAO.java
index 7a0dc0110f1..04c17737eef 100644
--- a/src/main/java/org/olat/instantMessaging/manager/RosterDAO.java
+++ b/src/main/java/org/olat/instantMessaging/manager/RosterDAO.java
@@ -111,7 +111,8 @@ public class RosterDAO {
}
public void deleteEntry(Identity identity, OLATResourceable ores) {
- dbInstance.getCurrentEntityManager().createNamedQuery("deleteIMRosterEntryByIdentityAndResource")
+ String del = "delete from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname";
+ dbInstance.getCurrentEntityManager().createQuery(del)
.setParameter("identityKey", identity.getKey())
.setParameter("resid", ores.getResourceableId())
.setParameter("resname", ores.getResourceableTypeName())
diff --git a/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java b/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java
index 0ac51d4cda6..12c1cdafdb0 100644
--- a/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java
+++ b/src/main/java/org/olat/instantMessaging/model/RosterEntryImpl.java
@@ -48,8 +48,7 @@ import org.olat.core.id.Persistable;
@NamedQuery(name="loadIMRosterEntryByIdentityandResource", query="select entry from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname"),
@NamedQuery(name="loadIMRosterEntryForUpdate", query="select entry from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname",
lockMode=LockModeType.PESSIMISTIC_WRITE),
- @NamedQuery(name="loadIMRosterEntryByResource", query="select entry from imrosterentry entry where entry.resourceId=:resid and entry.resourceTypeName=:resname"),
- @NamedQuery(name="deleteIMRosterEntryByIdentityAndResource", query="delete from imrosterentry entry where entry.identityKey=:identityKey and entry.resourceId=:resid and entry.resourceTypeName=:resname")
+ @NamedQuery(name="loadIMRosterEntryByResource", query="select entry from imrosterentry entry where entry.resourceId=:resid and entry.resourceTypeName=:resname")
})
public class RosterEntryImpl implements Persistable, CreateInfo {
--
GitLab