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 2021/07/04 15:36:50 UTC
[archiva] 01/03: Fixing NPEs
This is an automated email from the ASF dual-hosted git repository.
martin_s pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/archiva.git
commit bc27b2584b5a1500cb74419a1a98a02acb4dff4d
Author: Martin Stockhammer <ma...@apache.org>
AuthorDate: Sat Jul 3 11:20:04 2021 +0200
Fixing NPEs
---
.../archiva/admin/mock/MavenIndexContextMock.java | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MavenIndexContextMock.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MavenIndexContextMock.java
index ebdd0c7..81e6377 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MavenIndexContextMock.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/mock/MavenIndexContextMock.java
@@ -47,12 +47,17 @@ public class MavenIndexContextMock implements ArchivaIndexingContext {
MavenIndexContextMock(Repository repository, IndexingContext delegate) {
this.delegate = delegate;
this.repository = repository;
- try {
- this.filesystemStorage = new FilesystemStorage(delegate.getIndexDirectoryFile().toPath(), new DefaultFileLockManager());
- } catch (IOException e) {
- e.printStackTrace();
+ if(delegate!=null && delegate.getIndexDirectoryFile()!=null)
+ {
+ try
+ {
+ this.filesystemStorage = new FilesystemStorage( delegate.getIndexDirectoryFile( ).toPath( ), new DefaultFileLockManager( ) );
+ }
+ catch ( IOException e )
+ {
+ e.printStackTrace( );
+ }
}
-
}
@Override
@@ -95,7 +100,7 @@ public class MavenIndexContextMock implements ArchivaIndexingContext {
public void close(boolean deleteFiles) throws IOException {
open = false;
try {
- delegate.close(deleteFiles);
+ if (delegate!=null) delegate.close(deleteFiles);
} catch (NoSuchFileException e) {
// Ignore missing directory
}
@@ -105,7 +110,7 @@ public class MavenIndexContextMock implements ArchivaIndexingContext {
public void close() throws IOException {
open = false;
try {
- delegate.close(false);
+ if (delegate!=null) delegate.close(false);
} catch (NoSuchFileException e) {
// Ignore missing directory
}