Commit fafc8195 authored by Patrick Dowler's avatar Patrick Dowler
Browse files

Merge branch 'ac2release' of ssh://gimli2/srv/cadc/git/wopencadc into ac2release

parents 0a079113 0ee49056

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java

+3 −0
Original line number Diff line number Diff line
@@ -967,6 +967,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
    protected Group getGroup(final DN groupDN)

        throws LDAPException, GroupNotFoundException, UserNotFoundException

    {

        logger.debug("groupDN=" + groupDN.toNormalizedString());

        Filter filter = Filter.createEqualityFilter("entrydn", 

                                                    groupDN.toNormalizedString());
@@ -996,6 +997,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO 
            throw new GroupNotFoundException(groupDN.toNormalizedString());

        }



        logger.debug("cn=" + searchResult.getAttributeValue("cn"));

        logger.debug("owner=" + searchResult.getAttributeValue("owner"));

        Group group = new Group(searchResult.getAttributeValue("cn"),

                                userPersist.getMember(

                                        new DN(searchResult.getAttributeValue(