You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2007/04/27 14:30:08 UTC

svn commit: r533078 - in /incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database: PlainPasswordFilePrincipalDatabase.java PropertiesPrincipalDatabase.java

Author: ritchiem
Date: Fri Apr 27 05:30:07 2007
New Revision: 533078

URL: http://svn.apache.org/viewvc?view=rev&rev=533078
Log:
Updated PrincipalDatabase implementations to return empty strings rather than null. As this causes NPE on MC.

Modified:
    incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
    incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java

Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java?view=diff&rev=533078&r1=533077&r2=533078
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java Fri Apr 27 05:30:07 2007
@@ -39,6 +39,7 @@
 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 List<Principal> getUsers()
     {
-        return null; //todo
+        return new LinkedList<Principal>(); //todo
     }
 
     public Principal getUser(String username)

Modified: incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java?view=diff&rev=533078&r1=533077&r2=533078
==============================================================================
--- incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java (original)
+++ incubator/qpid/branches/M2/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PropertiesPrincipalDatabase.java Fri Apr 27 05:30:07 2007
@@ -31,6 +31,7 @@
 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 List<Principal> getUsers()
     {
-        return null; //todo
+        return new LinkedList<Principal>(); //todo
     }
 
     public Principal getUser(String username)