archiva-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Deng Ching <och...@apache.org>
Subject Re: svn commit: r1022813 - in /archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src: main/java/org/apache/archiva/web/xmlrpc/services/ test/java/org/apache/archiva/web/xmlrpc/services/
Date Fri, 05 Nov 2010 09:30:27 GMT
Sorry, I was in a hurry when I fixed this bug. I'll update the said
code to use isDebugLogEnabled()  instead :)

Thanks,
Deng

On Wed, Oct 27, 2010 at 1:34 PM, Brett Porter <brett@apache.org> wrote:
>
> On 15/10/2010, at 1:58 PM, oching@apache.org wrote:
>
>> Modified: archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
>> URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java?rev=1022813&r1=1022812&r2=1022813&view=diff
>> ==============================================================================
>> --- archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
(original)
>> +++ archiva/trunk/archiva-modules/archiva-web/archiva-xmlrpc/archiva-xmlrpc-services/src/main/java/org/apache/archiva/web/xmlrpc/services/AdministrationServiceImpl.java
Fri Oct 15 02:58:49 2010
>> @@ -475,6 +475,8 @@ public class AdministrationServiceImpl
>>         Configuration config = archivaConfiguration.getConfiguration();
>>         repoConfig = config.findManagedRepositoryById( repoId );
>>
>> +        log.debug( "Retrieved repository configuration for repo '" + repoId
+ "'" );
>> +
>>         if ( repoConfig != null )
>>         {
>>             stagingConfig = config.findManagedRepositoryById( stagingId );
>> @@ -485,32 +487,62 @@ public class AdministrationServiceImpl
>>
>>                 if ( repoConfig.isReleases() && !repoConfig.isSnapshots()
)
>>                 {
>> +                    log.info( "Repository to be merged contains releases
only.." );
>>                     if ( skipConflicts )
>>                     {
>>                         List<ArtifactMetadata> conflicts =
>> -                            repositoryMerger.getConflictingArtifacts(
stagingId, stagingId );
>> +                            repositoryMerger.getConflictingArtifacts(
repoId, stagingId );
>> +
>> +                        log.debug( "Artifacts in conflict.." );
>> +                        for( ArtifactMetadata metadata : conflicts )
>> +                        {
>> +                            log.debug( metadata.getNamespace() + ":"
+ metadata.getProject() + ":" +
>> +                                metadata.getProjectVersion() );
>> +                        }
>
> you can wrap this in an isDebugLogEnabled() so it doesn't have to loop aimlessly when
not debugging (same thing further down in the class).
>
> - Brett
>
> --
> Brett Porter
> brett@apache.org
> http://brettporter.wordpress.com/
>
>

Mime
View raw message