From e3aa5077389da8b30a866da4a878b79aebd0f672 Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Fri, 13 Nov 2009 12:40:33 +0000 Subject: [PATCH] Merged V3.2 to HEAD 17462: ETHREEOH-3346: New meaning to synchronization.synchronizeChangesOnly property - In the LDAP sync performance optimizations we always used the differential queries to determine the users and groups to be updated. Deletions were determined by a separate query. - This meant that if you ever did want to force the update of all users it wasn't possible. - So now when the flag is false it means don't use differential queries in the scheduled sync job. - The scheduled job now processes deletions regardless. - The default value for the property is now true. 17431: ETHREEOH-3274: Refix NTLM support for share - Fixed NPE introduced by ETHREEOH-2767 - Made web.xml validate against schema for JBoss - Reintroduced missing open comment in webscript-framework-config-custom.xml.sample 17426: ETHREEOH-2997: Fix ticket parameter passing into NTLM/Kerberos WebDAV authentication filters - A NPE was stopping it from working 17425: ETHREEOH-3282: Fixed NPE preventing upload from working with NTLM SSO enabled 17368: ETHREEOH-3197: Use utf8_bin collation in MySQL out of the box to avoid problems with comparison of accented characters 17361: ETHREEOH-3276: Don't attempt to start an LDAP sync when the repository is read only 17347: ETHREEOH-3206: Fix LocalFeedTaskProcessor to work with JBoss 5 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17464 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/app/servlet/AuthenticationHelper.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java index 2f75780f98..8ea5676485 100644 --- a/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java +++ b/source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java @@ -248,9 +248,10 @@ public final class AuthenticationHelper else { // set last authentication username cookie value - if (loginBean != null) + String loginName; + if (loginBean != null && (loginName = loginBean.getUsernameInternal()) != null) { - setUsernameCookie(req, res, loginBean.getUsernameInternal()); + setUsernameCookie(req, res, loginName); } // Set up the thread context