Merged revisions 549011 via svnmerge from

https://svn.apache.org/repos/asf/incubator/qpid/branches/M2

........
  r549011 | ritchiem | 2007-06-20 10:12:43 +0100 (Wed, 20 Jun 2007) | 1 line
  
  Proper update to PrincipalDatabase's to ensure they work correctly with # comments.
........


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@549016 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 23 insertions, 17 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 b29ea66bfc..352d41a0ba 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
@@ -211,17 +211,20 @@ public class PlainPasswordFilePrincipalDatabase implements PrincipalDatabase
             reader = new BufferedReader(new FileReader(_passwordFile));
             String line;
 
-            while ((line = reader.readLine()) != null && !line.startsWith("#"))
+            while ((line = reader.readLine()) != null)
             {
-                String[] result = _regexp.split(line);
-                if (result == null || result.length < 2)
+                if (!line.startsWith("#"))
                 {
-                    continue;
-                }
-
-                if (name.equals(result[0]))
-                {
-                    return result[1].toCharArray();
+                    String[] result = _regexp.split(line);
+                    if (result == null || result.length < 2)
+                    {
+                        continue;
+                    }
+
+                    if (name.equals(result[0]))
+                    {
+                        return result[1].toCharArray();
+                    }
                 }
             }
             return null;
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
index f4f3385c75..5c372f6c2c 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordVhostFilePrincipalDatabase.java
@@ -61,17 +61,20 @@ public class PlainPasswordVhostFilePrincipalDatabase extends PlainPasswordFilePr
                 reader = new BufferedReader(new FileReader(_passwordFile));
                 String line;
 
-                while ((line = reader.readLine()) != null && !line.startsWith("#"))
+                while ((line = reader.readLine()) != null)
                 {
-                    String[] result = _regexp.split(line);
-                    if (result == null || result.length < 3)
+                    if (!line.startsWith("#"))
                     {
-                        continue;
-                    }
+                        String[] result = _regexp.split(line);
+                        if (result == null || result.length < 3)
+                        {
+                            continue;
+                        }
 
-                    if (user.equals(result[0]))
-                    {
-                        return result[2].split(",");
+                        if (user.equals(result[0]))
+                        {
+                            return result[2].split(",");
+                        }
                     }
                 }
                 return null;