You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@archiva.apache.org by oc...@apache.org on 2008/01/30 03:51:56 UTC

svn commit: r616600 - /maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java

Author: oching
Date: Tue Jan 29 18:51:54 2008
New Revision: 616600

URL: http://svn.apache.org/viewvc?rev=616600&view=rev
Log:
-merged with -r616198 in archiva-1.0.x branch

Modified:
    maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java

Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java?rev=616600&r1=616599&r2=616600&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java Tue Jan 29 18:51:54 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()