From: Brett Porter <brett@apache.org>
Date: Thu, 25 Nov 2010 04:23:21 +0000 (+0000)
Subject: slight logging adjustment
X-Git-Tag: archiva-1.4-M1~896
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0452f87c94754cd795fd526b0bcba8f1f1d937aa;p=archiva.git

slight logging adjustment

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

diff --git a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
index c34cc5559..39bfe8286 100644
--- a/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
+++ b/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
@@ -19,14 +19,6 @@ package org.apache.archiva.web.xmlrpc.services;
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
 import org.apache.archiva.audit.AuditEvent;
 import org.apache.archiva.audit.AuditListener;
 import org.apache.archiva.metadata.model.ArtifactMetadata;
@@ -64,6 +56,14 @@ import org.codehaus.plexus.scheduler.CronExpressionValidator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 /**
  * AdministrationServiceImpl
  * 
@@ -493,11 +493,14 @@ public class AdministrationServiceImpl
                         List<ArtifactMetadata> conflicts =
                             repositoryMerger.getConflictingArtifacts( repoId, stagingId );
 
-                        log.debug( "Artifacts in conflict.." );
-                        for( ArtifactMetadata metadata : conflicts )
+                        if ( log.isDebugEnabled() )
                         {
-                            log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
-                                metadata.getProjectVersion() );
+                            log.debug( "Artifacts in conflict.." );
+                            for( ArtifactMetadata metadata : conflicts )
+                            {
+                                log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
+                                    metadata.getProjectVersion() );
+                            }
                         }
 
                         sourceArtifacts.removeAll( conflicts );
@@ -519,13 +522,16 @@ public class AdministrationServiceImpl
                         List<ArtifactMetadata> conflicts =
                             repositoryMerger.getConflictingArtifacts( repoId, stagingId );
 
-                        log.debug( "Artifacts in conflict.." );
-                        for( ArtifactMetadata metadata : conflicts )
+                        if ( log.isDebugEnabled() )
                         {
-                            log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
-                                metadata.getProjectVersion() );
+                            log.debug( "Artifacts in conflict.." );
+                            for( ArtifactMetadata metadata : conflicts )
+                            {
+                                log.debug( metadata.getNamespace() + ":" + metadata.getProject() + ":" +
+                                    metadata.getProjectVersion() );
+                            }
                         }
-                        
+
                         sourceArtifacts.removeAll( conflicts );
 
                         log.debug( "Source artifacts size :: " + sourceArtifacts.size() );