From 011e8fe0f68763caf56da0241e7126eb11ac348b Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Thu, 16 Jun 2016 08:29:55 +0200
Subject: [PATCH] OO-2052: remove group memberships first to prevent timing
 issue with the asynchronous removing of subscription (patch S. Clemenz)

---
 .../org/olat/group/ui/main/AbstractMemberListController.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java b/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
index 7dd48dca43e..95306d80906 100644
--- a/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
+++ b/src/main/java/org/olat/group/ui/main/AbstractMemberListController.java
@@ -605,8 +605,8 @@ public abstract class AbstractMemberListController extends FormBasicController i
 	protected void doLeave(List<Identity> members, boolean sendMail) {
 		MailPackage mailing = new MailPackage(sendMail);
 		if(repoEntry != null) {
-			repositoryManager.removeMembers(getIdentity(), members, repoEntry, mailing);
 			businessGroupService.removeMembers(getIdentity(), members, repoEntry.getOlatResource(), mailing);
+			repositoryManager.removeMembers(getIdentity(), members, repoEntry, mailing);
 		} else {
 			businessGroupService.removeMembers(getIdentity(), members, businessGroup.getResource(), mailing);
 		}
-- 
GitLab