Apache/archiva
1
0
Fork 0
mirror of https://github.com/apache/archiva.git synced 2025-02-08 02:59:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent npe

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1384832 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-09-14 16:03:01 +00:00
parent 1fa95137da
commit aaf625b997
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
archiva-modules/archiva-base/archiva-configuration/src/main/java/org/apache/archiva/configuration/FileTypes.java
View File

@ -44,10 +44,8 @@
/** /**
* FileTypes * FileTypes
*
*
*/ */
@Service( "fileTypes" ) @Service ("fileTypes")
public class FileTypes public class FileTypes
implements RegistryListener implements RegistryListener
{ {
@ -63,7 +61,7 @@ public class FileTypes
* *
*/ */
@Inject @Inject
@Named( value = "archivaConfiguration#default" ) @Named (value = "archivaConfiguration#default")
private ArchivaConfiguration archivaConfiguration; private ArchivaConfiguration archivaConfiguration;
/** /**
@ -108,14 +106,17 @@ public List<String> getFileTypePatterns( String id )
{ {
Configuration config = archivaConfiguration.getConfiguration(); Configuration config = archivaConfiguration.getConfiguration();
Predicate selectedFiletype = new FiletypeSelectionPredicate( id ); Predicate selectedFiletype = new FiletypeSelectionPredicate( id );
FileType filetype = RepositoryScanningConfiguration repositoryScanningConfiguration = config.getRepositoryScanning();
(FileType) CollectionUtils.find( config.getRepositoryScanning().getFileTypes(), selectedFiletype ); if ( repositoryScanningConfiguration != null )
if ( ( filetype != null ) && CollectionUtils.isNotEmpty( filetype.getPatterns() ) )
{ {
return filetype.getPatterns(); FileType filetype =
} (FileType) CollectionUtils.find( config.getRepositoryScanning().getFileTypes(), selectedFiletype );
if ( ( filetype != null ) && CollectionUtils.isNotEmpty( filetype.getPatterns() ) )
{
return filetype.getPatterns();
}
}
List<String> defaultPatterns = defaultTypeMap.get( id ); List<String> defaultPatterns = defaultTypeMap.get( id );
if ( CollectionUtils.isEmpty( defaultPatterns ) ) if ( CollectionUtils.isEmpty( defaultPatterns ) )

2
archiva-modules/archiva-web/archiva-webapp/src/test/java/org/apache/archiva/web/tags/DependencyTreeTest.java
View File

@ -31,6 +31,7 @@
import org.apache.archiva.configuration.ArchivaConfiguration; import org.apache.archiva.configuration.ArchivaConfiguration;
import org.apache.archiva.configuration.Configuration; import org.apache.archiva.configuration.Configuration;
import org.apache.archiva.configuration.ManagedRepositoryConfiguration; import org.apache.archiva.configuration.ManagedRepositoryConfiguration;
import org.apache.archiva.configuration.RepositoryScanningConfiguration;
import org.apache.archiva.metadata.model.ProjectVersionMetadata; import org.apache.archiva.metadata.model.ProjectVersionMetadata;
import org.apache.archiva.metadata.repository.RepositorySession; import org.apache.archiva.metadata.repository.RepositorySession;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner; import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
@ -100,6 +101,7 @@ public void setUp()
configuration.addManagedRepository( repoConfig ); configuration.addManagedRepository( repoConfig );
ArchivaConfiguration archivaConfiguration = applicationContext.getBean( ArchivaConfiguration.class ); ArchivaConfiguration archivaConfiguration = applicationContext.getBean( ArchivaConfiguration.class );
archivaConfiguration.getConfiguration().setRepositoryScanning( new RepositoryScanningConfiguration() );
archivaConfiguration.save( configuration ); archivaConfiguration.save( configuration );
TestMetadataResolver metadataResolver = applicationContext.getBean( TestMetadataResolver.class ); TestMetadataResolver metadataResolver = applicationContext.getBean( TestMetadataResolver.class );