inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.0 to HEAD

Browse Source 
12140: Merged V2.2 to V3.0
    11732: Fixed ETWOTWO-804: Node and Transaction Cleanup Job
    11747: Missed config for Node and Txn purging
    11826: WCM - fix ETWOTWO-817
    11951: Fixed ETWOTWO-901: NodeService cleanup must be pluggable
    11961: Merged V2.1 to V2.2
      11561: ETWOONE-224: when renaming duplicates during copy association names where not renamed 
      11583: (ALREADY PRESENT) Updated NTLM config example in web.xml - adding missing servlet mappings
      11584: Fix for ETWOONE-209 - JavaScript People.createGroup() API now correctly checks for actual group name when testing for existence
      11585: Fix for ETWOONE-214 - View In CIFS link now works even when users des not have view permissions on the parent folder
      11612: Fix for ETWOONE-91: the description textarea in the modify space properties web form eats one leading newline each time it is submitted
      11613: Fix 2.1 build and adjust implementation of ETWOONE-224 fix
      11621: Fix for ETWOONE-343
      11669: Improved debug from index tracking when exceptions occur
  12141: Avoid annoying Spring WARN messages for ClientAbortException
  12143: File that should have been deleted in CHK-5460 (rev 12140)
  12177: Fix failing FS Deployment Tests since introduction of transaction check advice.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12507 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2008-12-19 10:21:51 +00:00
parent 0fb0f1cae0
commit 59c24f2c6b
4 changed files with 50 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
source/java/org/alfresco/web/app/servlet/AuthenticationHelper.java
View File

@@ -86,9 +86,6 @@ public final class AuthenticationHelper
/** cookie names */
private static final String COOKIE_ALFUSER = "alfUser";
/** portal mode key name */
private static ThreadLocal<String> portalUserKeyName = new ThreadLocal<String>();
private static Log logger = LogFactory.getLog(AuthenticationHelper.class);
@@ -434,24 +431,16 @@ public final class AuthenticationHelper
// naff solution as we need to enumerate all session keys until we find the one that
// should match our User objects - this is weak but we don't know how the underlying
// Portal vendor has decided to encode the objects in the session
if (portalUserKeyName.get() == null)
Enumeration enumNames = session.getAttributeNames();
while (enumNames.hasMoreElements())
{
Enumeration enumNames = session.getAttributeNames();
while (enumNames.hasMoreElements())
String name = (String)enumNames.nextElement();
if (name.endsWith(AUTHENTICATION_USER))
{
String name = (String)enumNames.nextElement();
if (name.endsWith(AUTHENTICATION_USER))
{
// cache the key value once found!
portalUserKeyName.set(name);
break;
}
user = (User)session.getAttribute(name);
break;
}
}
if (portalUserKeyName.get() != null)
{
user = (User)session.getAttribute(portalUserKeyName.get());
}
}
return user;