fix test problems

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@756587 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
index d99c9d7bccbae4a8fee2bdb016eca8b36d8cc54a..7ec8af4bfc3753416bc4c0e2bc47171436e7e696 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
+++ b/archiva-modules/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/audit/AuditLog.java
@@ -46,7 +46,7 @@ public class AuditLog
         StringBuffer msg = new StringBuffer();
         msg.append( checkNull( event.getRepositoryId() ) ).append( DELIM );
         msg.append( event.getUserId() ).append( DELIM );
-        msg.append( event.getRemoteIP() ).append( DELIM );
+        msg.append( checkNull( event.getRemoteIP() ) ).append( DELIM );
         msg.append( '\"' ).append( checkNull( event.getResource() ) ).append( '\"' ).append( DELIM );
         msg.append( '\"' ).append( event.getAction() ).append( '\"' );
 

diff --git a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
index a12f4d72ca76eb9e824874fd43a9d9b2ad107d14..3176318254f441690d1c62fc4a5e8610e674a36f 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
+++ b/archiva-modules/archiva-web/archiva-security/src/main/java/org/apache/maven/archiva/security/ArchivaXworkUser.java
@@ -40,6 +40,11 @@ public final class ArchivaXworkUser
     
     public static String getActivePrincipal( Map<String, ?> sessionMap )
     {
+        if ( sessionMap == null )
+        {
+            return UserManager.GUEST_USERNAME;
+        }
+        
         SecuritySession securitySession =
             (SecuritySession) sessionMap.get( SecuritySystemConstants.SECURITY_SESSION_KEY );
 

diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
index 8780aba449132fd13c50f86d2a68b1ffcdf25f4d..03ea5274d9498ec3961c4757f12fb000df42edba 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
+++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/PlexusActionSupport.java
@@ -23,6 +23,8 @@ import java.util.ArrayList;
 import java.util.List;\r
 import java.util.Map;\r
 \r
+import javax.servlet.http.HttpServletRequest;\r
+\r
 import org.apache.maven.archiva.repository.audit.AuditEvent;\r
 import org.apache.maven.archiva.repository.audit.AuditListener;\r
 import org.apache.maven.archiva.repository.audit.Auditable;\r
@@ -75,7 +77,7 @@ public abstract class PlexusActionSupport
     protected void triggerAuditEvent( String repositoryId, String resource, String action )\r
     {\r
         AuditEvent event = new AuditEvent( repositoryId, getPrincipal(), resource, action );\r
-        event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );\r
+        event.setRemoteIP( getRemoteAddr() );\r
     \r
         for ( AuditListener listener : auditListeners )\r
         {\r
@@ -86,7 +88,7 @@ public abstract class PlexusActionSupport
     protected void triggerAuditEvent( String resource, String action )\r
     {\r
         AuditEvent event = new AuditEvent( getPrincipal(), resource, action );\r
-        event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );\r
+        event.setRemoteIP( getRemoteAddr() );\r
         \r
         for ( AuditListener listener : auditListeners )\r
         {\r
@@ -97,7 +99,7 @@ public abstract class PlexusActionSupport
     protected void triggerAuditEvent( String action )\r
     {\r
         AuditEvent event = new AuditEvent( getPrincipal(), action );\r
-        event.setRemoteIP( ServletActionContext.getRequest().getRemoteAddr() );\r
+        event.setRemoteIP( getRemoteAddr() );\r
         \r
         for ( AuditListener listener : auditListeners )\r
         {\r
@@ -105,6 +107,12 @@ public abstract class PlexusActionSupport
         }\r
     }\r
 \r
+    private String getRemoteAddr()\r
+    {\r
+        HttpServletRequest request = ServletActionContext.getRequest();\r
+        return request != null ? request.getRemoteAddr() : null;\r
+    }\r
+\r
     @SuppressWarnings( "unchecked" )\r
     protected String getPrincipal()\r
     {\r