From 8489a462eeaafb939e0dff346e9c478ecc786186 Mon Sep 17 00:00:00 2001
From: Jeff Burke <Jeff.Burke@nrc-cnrc.gc.ca>
Date: Thu, 3 Sep 2015 13:15:32 -0700
Subject: [PATCH] s1728: removed some debug messages
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 2 +-
.../src/ca/nrc/cadc/ac/server/web/users/UserServlet.java | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index 2c0479d7..a886b900 100755
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -312,7 +312,7 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
catch (UserNotFoundException e)
{
throw new RuntimeException("BUG: new user " + userDN.toNormalizedString() +
- " not found because " + e.getMessage());
+ " not found");
}
}
catch (LDAPException e)
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java
index 2c7de439..e73a9ae9 100644
--- a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java
+++ b/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java
@@ -262,12 +262,10 @@ public class UserServlet extends HttpServlet
Set<Principal> principals = extractor.getPrincipals();
log.debug("Principals: " + principals);
- log.debug("notAugmentedX500User" + notAugmentedX500User);
for (Principal principal : principals)
{
if (principal instanceof X500Principal)
{
- log.debug("principal: " + principal.getName());
if (principal.getName().equalsIgnoreCase(notAugmentedX500User))
{
return true;
--
GitLab