]> source.dussan.org Git - archiva.git/commitdiff
slight logging adjustment
authorBrett Porter <brett@apache.org>
Thu, 25 Nov 2010 04:23:21 +0000 (04:23 +0000)
committerBrett Porter <brett@apache.org>
Thu, 25 Nov 2010 04:23:21 +0000 (04:23 +0000)
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1038916 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java

index c34cc5559f39995bb75d521059598b9e44950453..39bfe82861c5f8242d002d8938b83c991e0ae806 100644 (file)
@@ -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() );