Return-Path: X-Original-To: apmail-archiva-commits-archive@www.apache.org Delivered-To: apmail-archiva-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A8E69D11E for ; Fri, 14 Sep 2012 16:03:46 +0000 (UTC) Received: (qmail 64219 invoked by uid 500); 14 Sep 2012 16:03:46 -0000 Delivered-To: apmail-archiva-commits-archive@archiva.apache.org Received: (qmail 64190 invoked by uid 500); 14 Sep 2012 16:03:46 -0000 Mailing-List: contact commits-help@archiva.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@archiva.apache.org Delivered-To: mailing list commits@archiva.apache.org Received: (qmail 64179 invoked by uid 99); 14 Sep 2012 16:03:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 16:03:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Sep 2012 16:03:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 265D123888EA for ; Fri, 14 Sep 2012 16:03:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1384832 - in /archiva/trunk/archiva-modules: archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java Date: Fri, 14 Sep 2012 16:03:01 -0000 To: commits@archiva.apache.org From: olamy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120914160302.265D123888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: olamy Date: Fri Sep 14 16:03:01 2012 New Revision: 1384832 URL: http://svn.apache.org/viewvc?rev=1384832&view=rev Log: prevent npe Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java Modified: archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java?rev=1384832&r1=1384831&r2=1384832&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java (original) +++ archiva/trunk/archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java Fri Sep 14 16:03:01 2012 @@ -44,10 +44,8 @@ import java.util.Map; /** * FileTypes - * - * */ -@Service( "fileTypes" ) +@Service ("fileTypes") public class FileTypes implements RegistryListener { @@ -63,7 +61,7 @@ public class FileTypes * */ @Inject - @Named( value = "archivaConfiguration#default" ) + @Named (value = "archivaConfiguration#default") private ArchivaConfiguration archivaConfiguration; /** @@ -108,14 +106,17 @@ public class FileTypes { Configuration config = archivaConfiguration.getConfiguration(); Predicate selectedFiletype = new FiletypeSelectionPredicate( id ); - FileType filetype = - (FileType) CollectionUtils.find( config.getRepositoryScanning().getFileTypes(), selectedFiletype ); - - if ( ( filetype != null ) && CollectionUtils.isNotEmpty( filetype.getPatterns() ) ) + RepositoryScanningConfiguration repositoryScanningConfiguration = config.getRepositoryScanning(); + if ( repositoryScanningConfiguration != null ) { - return filetype.getPatterns(); - } + FileType filetype = + (FileType) CollectionUtils.find( config.getRepositoryScanning().getFileTypes(), selectedFiletype ); + if ( ( filetype != null ) && CollectionUtils.isNotEmpty( filetype.getPatterns() ) ) + { + return filetype.getPatterns(); + } + } List defaultPatterns = defaultTypeMap.get( id ); if ( CollectionUtils.isEmpty( defaultPatterns ) ) Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java?rev=1384832&r1=1384831&r2=1384832&view=diff ============================================================================== --- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java (original) +++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java Fri Sep 14 16:03:01 2012 @@ -31,6 +31,7 @@ import org.apache.archiva.common.plexusb import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration; +import org.apache.archiva.configuration.RepositoryScanningConfiguration; import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; @@ -100,6 +101,7 @@ public class DependencyTreeTest configuration.addManagedRepository( repoConfig ); ArchivaConfiguration archivaConfiguration = applicationContext.getBean( ArchivaConfiguration.class ); + archivaConfiguration.getConfiguration().setRepositoryScanning( new RepositoryScanningConfiguration() ); archivaConfiguration.save( configuration ); TestMetadataResolver metadataResolver = applicationContext.getBean( TestMetadataResolver.class );