From 996a3b6f169976c30254665d8d2b0a7a37ec7b1f Mon Sep 17 00:00:00 2001 From: Eduard Heimbuch Date: Fri, 12 Feb 2021 08:23:09 +0100 Subject: [PATCH] Fix NPE --- .../sonia/scm/importexport/FullScmRepositoryImporter.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scm-webapp/src/main/java/sonia/scm/importexport/FullScmRepositoryImporter.java b/scm-webapp/src/main/java/sonia/scm/importexport/FullScmRepositoryImporter.java index 71882ab676..bd57051f98 100644 --- a/scm-webapp/src/main/java/sonia/scm/importexport/FullScmRepositoryImporter.java +++ b/scm-webapp/src/main/java/sonia/scm/importexport/FullScmRepositoryImporter.java @@ -45,6 +45,7 @@ import java.io.FilterInputStream; import java.io.IOException; import java.io.InputStream; import java.util.Collection; +import java.util.Collections; import java.util.HashSet; import static sonia.scm.importexport.FullScmRepositoryExporter.METADATA_FILE_NAME; @@ -169,7 +170,10 @@ public class FullScmRepositoryImporter { ArchiveEntry metadataEntry = tais.getNextEntry(); if (metadataEntry.getName().equals(METADATA_FILE_NAME)) { RepositoryMetadata metadata = JAXB.unmarshal(new NoneClosingInputStream(tais), RepositoryMetadata.class); - return new HashSet<>(metadata.getPermissions()); + if (metadata != null && metadata.getPermissions() != null) { + return new HashSet<>(metadata.getPermissions()); + } + return Collections.emptySet(); } else { throw new ImportFailedException( ContextEntry.ContextBuilder.noContext(),