Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding null checks for index manager

This commit is contained in:
Martin Stockhammer 2019-09-22 00:08:17 +02:00
parent 74d69f36c8
commit d9f8834dc1
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
View File

@ -149,12 +149,17 @@ public class MavenIndexManager implements ArchivaIndexManager {
public static IndexingContext getMvnContext( ArchivaIndexingContext context ) throws UnsupportedBaseContextException
{
if ( !context.supports( IndexingContext.class ) )
if (context!=null)
{
log.error( "The provided archiva index context does not support the maven IndexingContext" );
throw new UnsupportedBaseContextException( "The context does not support the Maven IndexingContext" );
if ( !context.supports( IndexingContext.class ) )
{
log.error( "The provided archiva index context does not support the maven IndexingContext" );
throw new UnsupportedBaseContextException( "The context does not support the Maven IndexingContext" );
}
return context.getBaseContext( IndexingContext.class );
} else {
return null;
}
return context.getBaseContext( IndexingContext.class );
}
private StorageAsset getIndexPath( ArchivaIndexingContext ctx )
@ -175,6 +180,9 @@ public class MavenIndexManager implements ArchivaIndexManager {
*/
private void executeUpdateFunction( ArchivaIndexingContext context, IndexUpdateConsumer function ) throws IndexUpdateFailedException
{
if (context==null) {
throw new IndexUpdateFailedException( "Given context is null" );
}
IndexingContext indexingContext = null;
try
{