From f0bf542f6aeb4bea400eef6866fd75e2e93f3074 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Thu, 1 Mar 2007 15:56:52 +0000 Subject: [PATCH] Merged from BRANCHES/DEV/KEVINR: . Fix from Andy for jboss portal issue with audit component . Fix to AlfrescoFacesPortlet to work with JBossPortal2.4.1 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@5249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/app/portlet/AlfrescoFacesPortlet.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java index dbc0c8e7b2..2d10a7ffcf 100644 --- a/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java +++ b/source/java/org/alfresco/web/app/portlet/AlfrescoFacesPortlet.java @@ -180,8 +180,11 @@ public class AlfrescoFacesPortlet extends MyFacesGenericPortlet String oldValue = request.getPreferences().getValue(PREF_ALF_USERNAME, null); if (oldValue == null || oldValue.equals(loginBean.getUsernameInternal()) == false) { - request.getPreferences().setValue(PREF_ALF_USERNAME, loginBean.getUsernameInternal()); - request.getPreferences().store(); + if (request.getPreferences().isReadOnly(PREF_ALF_USERNAME) == false) + { + request.getPreferences().setValue(PREF_ALF_USERNAME, loginBean.getUsernameInternal()); + request.getPreferences().store(); + } } } @@ -303,7 +306,10 @@ public class AlfrescoFacesPortlet extends MyFacesGenericPortlet if (session.getAttribute(AuthenticationHelper.SESSION_INVALIDATED) != null) { // remove the username preference value as explicit logout was requested by the user - request.getPreferences().reset(PREF_ALF_USERNAME); + if (request.getPreferences().isReadOnly(PREF_ALF_USERNAME) == false) + { + request.getPreferences().reset(PREF_ALF_USERNAME); + } session.removeAttribute(AuthenticationHelper.SESSION_INVALIDATED); }