svn commit: r980397 - /archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java

[oching]

Author: oching
Date: Thu Jul 29 10:52:57 2010
New Revision: 980397

URL: http://svn.apache.org/viewvc?rev=980397&view=rev
Log:
[MRM-1406] use terget repo name instead of staging repo name for audit logging 
submitted by Patti Arachchige Eshan Sudharaka

Modified:
    
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java

Modified: 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
URL: 
http://svn.apache.org/viewvc/archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java?rev=980397&r1=980396&r2=980397&view=diff
==============================================================================
--- 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
 (original)
+++ 
archiva/branches/archiva-MRM-980/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java
 Thu Jul 29 10:52:57 2010
@@ -99,7 +99,7 @@ public class MergeAction
 
             for ( ArtifactMetadata metadata : sourceArtifacts )
             {
-                triggerAuditEvent( targetRepoId, metadata.getId(), 
AuditEvent.MERGING_REPOSITORIES );
+                triggerAuditEvent( repoid, metadata.getId(), 
AuditEvent.MERGING_REPOSITORIES );
             }
             return SUCCESS;
         }
@@ -121,7 +121,7 @@ public class MergeAction
 
             for ( ArtifactMetadata metadata : sourceArtifacts )
             {
-                triggerAuditEvent( targetRepoId, metadata.getId(), 
AuditEvent.MERGING_REPOSITORIES );
+                triggerAuditEvent( repoid, metadata.getId(), 
AuditEvent.MERGING_REPOSITORIES );
             }
             return SUCCESS;