svn commit: r1308257 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js

[olamy]

Author: olamy
Date: Mon Apr  2 07:19:20 2012
New Revision: 1308257

URL: http://svn.apache.org/viewvc?rev=1308257&view=rev
Log:
prevent StringIndexOutOfBoundsException on AuditEvent creation

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java?rev=1308257&r1=1308256&r2=1308257&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/AbstractRestService.java
 Mon Apr  2 07:19:20 2012
@@ -147,10 +147,7 @@ public abstract class AbstractRestServic
 
     protected void triggerAuditEvent( String repositoryId, String filePath, 
String action )
     {
-        AuditEvent auditEvent = new AuditEvent( action, repositoryId );
-        auditEvent.setAction( action );
-        auditEvent.setRepositoryId( repositoryId );
-        auditEvent.setResource( filePath );
+        AuditEvent auditEvent = new AuditEvent( repositoryId, getPrincipal(), 
filePath, action );
         AuditInformation auditInformation = getAuditInformation();
         auditEvent.setUserId( auditInformation.getUser() == null ? "" : 
auditInformation.getUser().getUsername() );
         auditEvent.setRemoteIP( auditInformation.getRemoteAddr() );

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js?rev=1308257&r1=1308256&r2=1308257&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/artifacts-management.js
 Mon Apr  2 07:19:20 2012
@@ -101,6 +101,9 @@ define("archiva.artifacts-management",["
                 $('#fileupload').bind('fileuploadsubmit', function (e, data) {
                   var pomFile = data.context.find('#pomFile' ).attr("checked");
                   var classifier = data.context.find('#classifier' ).val();
+                  if (!data.formData){
+                    data.formData={};
+                  }
                   data.formData.pomFile = pomFile;
                   data.formData.classifier = classifier;
                 });