From b6119cdfd442443f4e627754c046e957eca1310e Mon Sep 17 00:00:00 2001
From: Adrian Damian <Adrian.Damian@nrc-cnrc.gc.ca>
Date: Tue, 23 Sep 2014 07:47:03 -0700
Subject: [PATCH] Small fix
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 6 +++---
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 2 +-
2 files changed, 4 insertions(+), 4 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 1a7b5f85..384e9a4f 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
@@ -197,7 +197,7 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
{
LdapDAO.checkLdapResult(e.getResultCode(),
e.getDiagnosticMessage());
- return null; //TODO
+ throw new RuntimeException("Unexpected LDAP exception", e);
}
}
@@ -303,8 +303,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
catch (LDAPException e)
{
LdapDAO.checkLdapResult(e.getResultCode(), e.getDiagnosticMessage());
+ throw new RuntimeException("Unexpected LDAP exception", e);
}
- return null;
}
@@ -788,8 +788,8 @@ public class LdapGroupDAO<T extends Principal> extends LdapDAO
for (SearchResultEntry result : results.getSearchEntries())
{
String groupName = result.getAttributeValue("cn");
+ groups.add(new Group(groupName, null));
}
-
}
catch (LDAPException e)
{
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 8c21c14e..be6d8173 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
@@ -342,8 +342,8 @@ public class LdapUserDAO<T extends Principal> extends LdapDAO
catch (LDAPException e)
{
LdapDAO.checkLdapResult(e.getResultCode(), e.getDiagnosticMessage());
+ throw new RuntimeException("Unexpected LDAP exception", e);
}
- return false;
}
/**
--
GitLab