Author: thomas.heute(a)jboss.com Date: 2007-12-05 17:11:35 -0500 (Wed, 05 Dec 2007) New Revision: 9303 Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java tags/JBoss_Portal_2_6_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml Log: JBPORTAL-1837: Searching user with some role fails Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/AssignRoleAction.java 2007-12-05 22:11:35 UTC (rev 9303) @@ -106,7 +106,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.currentUser = decoder.encode((String) params.get("currentUser")); + this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null; if (this.currentUser != null) { this.uiUser = new IdentityUIUser(this.currentUser); Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-12-05 22:11:35 UTC (rev 9303) @@ -214,7 +214,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.currentUser = decoder.encode((String) params.get("currentUser")); + this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null; this.windowState = null; if (this.currentUser == null) { @@ -295,7 +295,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.currentUser = decoder.encode((String) params.get("currentUser")); + this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null; return "adminChangePassword"; } Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditRoleAction.java 2007-12-05 22:11:35 UTC (rev 9303) @@ -75,7 +75,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.currentRole = decoder.encode((String) params.get("currentRole")); + this.currentRole = params.get("currentRole") != null ? decoder.encode((String) params.get("currentRole")) : null; try { this.uiRole = identityRoleBean.getUIRole(this.currentRole); Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/LostPasswordAction.java 2007-12-05 22:11:35 UTC (rev 9303) @@ -189,7 +189,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.username = decoder.encode((String) params.get("currentUser")); + this.username = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null; return "resetPassword"; } Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/RoleManagementBean.java 2007-12-05 22:11:35 UTC (rev 9303) @@ -154,7 +154,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - String role = decoder.encode((String) params.get("currentRole")); + String role = params.get("currentRole") != null ? decoder.encode((String) params.get("currentRole")) : null; this.currentRole = role != null ? role : this.currentRole; try { @@ -211,7 +211,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.currentRole = decoder.encode((String) params.get("currentRole")); + this.currentRole = params.get("currentRole") != null ? decoder.encode((String) params.get("currentRole")) : null; if (this.currentRole != null) { try Modified: tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/main/org/jboss/portal/core/identity/ui/admin/UserAdministrationBean.java 2007-12-05 22:11:35 UTC (rev 9303) @@ -261,7 +261,7 @@ ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); String action = (String) params.get("enableAction"); - this.currentUser = decoder.encode((String) params.get("currentUser")); + this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null; // TODO - do something better than .equals("admin") if (this.currentUser != null && action != null && ! this.currentUser.equals("admin")) @@ -348,7 +348,7 @@ FacesContext ctx = FacesContext.getCurrentInstance(); ExternalContext ectx = ctx.getExternalContext(); Map params = ectx.getRequestParameterMap(); - this.currentUser = decoder.encode((String) params.get("currentUser")); + this.currentUser = params.get("currentUser") != null ? decoder.encode((String) params.get("currentUser")) : null; if (this.currentUser != null) { this.uiUser = new IdentityUIUser(this.currentUser); Modified: tags/JBoss_Portal_2_6_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml =================================================================== --- tags/JBoss_Portal_2_6_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-12-05 22:04:05 UTC (rev 9302) +++ tags/JBoss_Portal_2_6_3/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-12-05 22:11:35 UTC (rev 9303) @@ -37,7 +37,7 @@ <name>default-view</name> <value>/WEB-INF/jsf/index.xhtml</value> </init-param> - <expiration-cache>-1</expiration-cache> + <expiration-cache>0</expiration-cache> <supports> <mime-type>text/html</mime-type> <portlet-mode>VIEW</portlet-mode>