From d5a9482dd286b19cea7704997e67bc25e6c1ad27 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Fri, 9 Nov 2007 08:01:03 +0000 Subject: [PATCH] -fixed browse repo problem (permissions) git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@593445 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/maven/archiva/web/util/ArchivaXworkUser.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java index 44223b82c..a9ce2ebb6 100644 --- a/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java +++ b/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/util/ArchivaXworkUser.java @@ -24,6 +24,7 @@ import com.opensymphony.xwork.ActionContext; import org.apache.maven.archiva.security.ArchivaRoleConstants; import org.apache.maven.archiva.security.ArchivaUser; import org.codehaus.plexus.redback.system.SecuritySession; +import org.codehaus.plexus.redback.system.SecuritySystemConstants; import org.codehaus.plexus.redback.users.User; import java.util.HashMap; @@ -55,18 +56,19 @@ public class ArchivaXworkUser private SecuritySession getSecuritySession() { - return (SecuritySession) getContextSession().get( SecuritySession.ROLE ); + return (SecuritySession) getContextSession().get( SecuritySystemConstants.SECURITY_SESSION_KEY ); } public String getActivePrincipal() { - SecuritySession securitySession = getSecuritySession(); + SecuritySession securitySession = getSecuritySession(); + if ( securitySession == null ) { return ArchivaRoleConstants.PRINCIPAL_GUEST; } - User user = securitySession.getUser(); + User user = securitySession.getUser(); if ( user == null ) { return ArchivaRoleConstants.PRINCIPAL_GUEST; -- 2.39.5