diff --git a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java index 4c191acaf0f43f740cf3a703d99b2adbb944eff5..ed3c629c00790be0beb211520e541582ef2f0bba 100644 --- a/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java +++ b/src/main/java/org/olat/group/ui/main/AbstractBusinessGroupListController.java @@ -274,7 +274,7 @@ public abstract class AbstractBusinessGroupListController extends BasicControlle BusinessGroup businessGroup = businessGroupService.loadBusinessGroup(businessGroupKey); //prevent rs after a group is deleted by someone else if(businessGroup == null) { - groupListModel.removeBusinessGroup(businessGroup); + groupListModel.removeBusinessGroup(businessGroupKey); groupListCtr.modelChanged(); } else if(TABLE_ACTION_DELETE.equals(actionid)) { BGTableItem item = groupListModel.getObject(te.getRowId()); diff --git a/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java b/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java index ed96fd0549102573b5793c55ebe7077b98947f42..56f3e50099108d902c302a28ed9d5b29f3743e0c 100644 --- a/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java +++ b/src/main/java/org/olat/group/ui/main/BusinessGroupTableModelWithType.java @@ -34,7 +34,6 @@ import org.olat.core.gui.components.table.DefaultTableDataModel; import org.olat.core.gui.translator.Translator; import org.olat.core.util.Formatter; import org.olat.core.util.filter.FilterFactory; -import org.olat.group.BusinessGroup; import org.olat.group.BusinessGroupMembership; /** @@ -173,10 +172,12 @@ public class BusinessGroupTableModelWithType extends DefaultTableDataModel<BGTab setObjects(owned); } - public void removeBusinessGroup(BusinessGroup bg) { + public void removeBusinessGroup(Long bgKey) { + if(bgKey == null) return; + for(int i=objects.size(); i-->0; ) { BGTableItem wrapped = (BGTableItem)objects.get(i); - if(bg.getKey().equals(wrapped.getBusinessGroupKey())) { + if(bgKey.equals(wrapped.getBusinessGroupKey())) { objects.remove(i); return; }