From fde7697e4d564c18dd99f1c67eca4e7326766055 Mon Sep 17 00:00:00 2001 From: "Maria Odea B. Ching" Date: Thu, 29 Jul 2010 10:52:57 +0000 Subject: [PATCH] [MRM-1406] use terget repo name instead of staging repo name for audit logging submitted by Patti Arachchige Eshan Sudharaka git-svn-id: https://svn.apache.org/repos/asf/archiva/branches/archiva-MRM-980@980397 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/org/apache/maven/archiva/web/action/MergeAction.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java index 542a8ecee..78a6c4fc6 100644 --- a/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java +++ b/archiva-modules/archiva-web/archiva-webapp/src/main/java/org/apache/maven/archiva/web/action/MergeAction.java @@ -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; -- 2.39.5