diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2007-04-27 12:30:07 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2007-04-27 12:30:07 +0000 |
| commit | da40f008ea5f15b927f41ef5ebc3488c5dc50895 (patch) | |
| tree | 4747240b7f93d4fbb9df10b617c164aa7446239a | |
| parent | e03851a70de7d8e2ce977adbb490b8bf7df14311 (diff) | |
| download | qpid-python-da40f008ea5f15b927f41ef5ebc3488c5dc50895.tar.gz | |
Updated PrincipalDatabase implementations to return empty strings rather than null. As this causes NPE on MC.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@533078 13f79535-47bb-0310-9956-ffa450edef68
2 files changed, 4 insertions, 2 deletions
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java index 5170f6216c..c49f4e2a33 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java @@ -39,6 +39,7 @@ import java.util.regex.Pattern; import java.util.Map; import java.util.HashMap; import java.util.List; +import java.util.LinkedList; import java.security.Principal; /** @@ -157,7 +158,7 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase public List<Principal> getUsers() { - return null; //todo + return new LinkedList<Principal>(); //todo } public Principal getUser(String username) diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java index 49cd71e978..73d58ca489 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java +++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java @@ -31,6 +31,7 @@ import java.util.Properties; import java.util.Map; import java.util.HashMap; import java.util.List; +import java.util.LinkedList; import java.security.Principal; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -142,7 +143,7 @@ public class PropertiesPrincipalDatabase implements PrincipalDatabase public List<Principal> getUsers() { - return null; //todo + return new LinkedList<Principal>(); //todo } public Principal getUser(String username) |