From 6b75874a244ca2fe6f7ebf256f68970e26562b39 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 5 Dec 2012 15:25:09 +0100
Subject: [PATCH] OO-408: fix query which retrieves the room reference for
 groups

---
 .../modules/openmeetings/manager/OpenMeetingsDAO.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java b/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
index 23192a4384c..ef9acb75b5a 100644
--- a/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
+++ b/src/main/java/org/olat/modules/openmeetings/manager/OpenMeetingsDAO.java
@@ -67,8 +67,10 @@ public class OpenMeetingsDAO {
 		ref.setRoomId(room.getRoomId());
 		ref.setConfig(serialized);
 		ref.setGroup(group);
-		ref.setResourceTypeName(courseResource.getResourceableTypeName());
-		ref.setResourceTypeId(courseResource.getResourceableId());
+		if(courseResource != null) {
+			ref.setResourceTypeName(courseResource.getResourceableTypeName());
+			ref.setResourceTypeId(courseResource.getResourceableId());
+		}
 		ref.setSubIdentifier(subIdentifier);
 		dbInstance.getCurrentEntityManager().persist(ref);
 		return ref;
@@ -87,7 +89,7 @@ public class OpenMeetingsDAO {
 		boolean where = false;
 		if(group != null) {
 			where = and(sb, where);
-			sb.append(" ref.group=:groupKey");
+			sb.append(" ref.group.key=:groupKey");
 		}
 		if(courseResource != null) {
 			where = and(sb, where);
-- 
GitLab