You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ma...@apache.org on 2019/09/21 22:08:56 UTC
[archiva] 02/03: Adding null checks for index manager
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch feature/storage_refactoring
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit fd48fb51b28d9b603fc3a4b23c37081a460e94a8
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sun Sep 22 00:08:17 2019 +0200
Adding null checks for index manager
---
.../apache/archiva/indexer/maven/MavenIndexManager.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
index 73a8900..4a4ad80 100644
--- a/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
+++ b/archiva-modules/archiva-maven/archiva-maven-indexer/src/main/java/org/apache/archiva/indexer/maven/MavenIndexManager.java
@@ -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
{