From 4c72ca86311475371d5b2527762e195484b61d08 Mon Sep 17 00:00:00 2001
From: Adrian Damian <Adrian.Damian@nrc.ca>
Date: Wed, 19 Nov 2014 16:24:54 -0800
Subject: [PATCH] Fixed bug
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
index 10a1a174..6cdbbca3 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
@@ -537,16 +537,19 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
{
try
{
- String memberGroupID =
- memberDN.getRDNString().replace("cn=", "");
ldapGroup.getGroupMembers().
- add(getGroup(memberGroupID));
+ add(getGroup(memberDN));
}
catch(GroupNotFoundException e)
{
// ignore as we are not cleaning up
// deleted groups from the group members
}
+ catch (UserNotFoundException e)
+ {
+ throw new RuntimeException(
+ "BUG: group owner not found");
+ }
}
else
{
--
GitLab