Author: oching
Date: Tue Jan 29 00:05:45 2008
New Revision: 616198
URL: http://svn.apache.org/viewvc?rev=616198&view=rev
Log:
[MRM-668]
-get the security session using SecuritySystemConstants.SECURITY_SESSION_KEY or
SecuritySession.ROLE in ArchivaXWorkUser
Modified:
maven/archiva/branches/archiva-1.0.x/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java
Modified:
maven/archiva/branches/archiva-1.0.x/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java
URL:
http://svn.apache.org/viewvc/maven/archiva/branches/archiva-1.0.x/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java?rev=616198&r1=616197&r2=616198&view=diff
==============================================================================
---
maven/archiva/branches/archiva-1.0.x/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java
(original)
+++
maven/archiva/branches/archiva-1.0.x/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java
Tue Jan 29 00:05:45 2008
@@ -56,7 +56,15 @@
private SecuritySession getSecuritySession()
{
- return (SecuritySession) getContextSession().get( SecuritySession.ROLE
);
+ SecuritySession securitySession =
+ (SecuritySession) getContextSession().get(
SecuritySystemConstants.SECURITY_SESSION_KEY );
+
+ if ( securitySession == null )
+ {
+ securitySession = (SecuritySession) getContextSession().get(
SecuritySession.ROLE );
+ }
+
+ return securitySession;
}
public String getActivePrincipal()
