[jboss-cvs] Picketbox SVN: r508 - trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role.

[jboss-cvs-commits at lists.jboss.org]

Author: dehort
Date: 2014-02-20 12:27:54 -0500 (Thu, 20 Feb 2014)
New Revision: 508

Modified:
   trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java
Log:
[SECURITY-797] Fixed a bug where the DatabaseRolesMappingProvider will attempt to use an empty result set if the rolesQuery returns an empty set.  This causes the authentication attempt to fail.


Modified: trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java
===================================================================
--- trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java	2014-02-20 17:09:12 UTC (rev 507)
+++ trunk/security-jboss-sx/jbosssx/src/main/java/org/jboss/security/mapping/providers/role/Util.java	2014-02-20 17:27:54 UTC (rev 508)
@@ -221,13 +221,15 @@
          {
             PicketBoxLogger.LOGGER.traceQueryWithEmptyResult();
          }
-         
-         do
+         else
          {
-            String name = rs.getString(1);
-            roleGroup.addRole(new SimpleRole(name));
+           do
+           {
+              String name = rs.getString(1);
+              roleGroup.addRole(new SimpleRole(name));
+           }
+           while (rs.next());
          }
-         while (rs.next());
       }
       catch (NamingException ex)
       {
@@ -295,4 +297,4 @@
       catch(Exception e)
       {}
    }
-}
\ No newline at end of file
+}