Commit efff48c4 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story ac2. Removed unnecessary type casts.

parent adaeb6b8

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

+2 −2
Original line number Diff line number Diff line
@@ -186,12 +186,12 @@ public abstract class LdapDAO 
                }

                if (p instanceof NumericPrincipal)

                {

                    ldapField = "(&(objectclass=cadcaccount)(numericid=" + p.getName() + "))";

                    ldapField = "(numericid=" + p.getName() + ")";

                    break;

                }

                if (p instanceof X500Principal)

                {

                    ldapField = "(&(objectclass=cadcaccount)(distinguishedname=" + p.getName() + "))";

                    ldapField = "(distinguishedname=" + p.getName() + ")";

                    break;

                }

                if (p instanceof OpenIdPrincipal)

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

+1 −2
Original line number Diff line number Diff line
@@ -466,8 +466,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO 
                    "Unsupported principal type " + userID.getClass());

        }



        searchField = "(&(objectclass=inetorgperson)(objectclass=cadcaccount)(" +

                      searchField + "=" + userID.getName() + "))";

        searchField = "(" + searchField + "=" + userID.getName() + ")";

        logger.debug(searchField);



        SearchResultEntry searchResult = null;