Author: sohil.shah(a)jboss.com Date: 2007-05-02 15:12:02 -0400 (Wed, 02 May 2007) New Revision: 7177 Modified: trunk/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java trunk/test/src/etc/datasources.xml Log: Fix: java.lang.NullPointerException for Users Role after deleting demo Test page - JBPORTAL-1363 Modified: trunk/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java =================================================================== --- trunk/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2007-05-02 18:42:13 UTC (rev 7176) +++ trunk/cms/src/main/org/jboss/portal/cms/security/AuthorizationProviderImpl.java 2007-05-02 19:12:02 UTC (rev 7177) @@ -345,7 +345,7 @@ if(!(this.userModule instanceof LDAPUserModule)) { //in case of a database version, use the cache optmized way to lookup the permissions - String lookupByRole = "SELECT * from jbp_cms_perm p,jbp_cms_perm_role r,jbp_role_membership m,jbp_roles roles,jbp_users users WHERE " + + String lookupByRole = "SELECT p.* from jbp_cms_perm p,jbp_cms_perm_role r,jbp_role_membership m,jbp_roles roles,jbp_users users WHERE " + "p.id=r.cms_perm_id AND " + "r.role_id=roles.jbp_name AND " + "m.jbp_rid=roles.jbp_rid AND " + Modified: trunk/test/src/etc/datasources.xml =================================================================== --- trunk/test/src/etc/datasources.xml 2007-05-02 18:42:13 UTC (rev 7176) +++ trunk/test/src/etc/datasources.xml 2007-05-02 19:12:02 UTC (rev 7177) @@ -48,4 +48,13 @@ <password>portalpassword</password> </datasource> --> +<!-- + <datasource> + <datasource-name>postgresql8</datasource-name> + <connection-url>jdbc:postgresql:jbossportal</connection-url> + <driver-class>org.postgresql.Driver</driver-class> + <user-name>portal</user-name> + <password>portalpassword</password> + </datasource> +--> </datasources>