Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-18 03:01:05 +01:00
Code Issues Packages Projects Releases Activity

Fix NPE

Browse Source
This commit is contained in:
Eduard Heimbuch
2021-02-12 08:23:09 +01:00
parent a0f50f5199
commit 996a3b6f16
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scm-webapp/src/main/java/sonia/scm/importexport/FullScmRepositoryImporter.java
View File

@@ -45,6 +45,7 @@ import java.io.FilterInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
import static sonia.scm.importexport.FullScmRepositoryExporter.METADATA_FILE_NAME; import static sonia.scm.importexport.FullScmRepositoryExporter.METADATA_FILE_NAME;
@@ -169,7 +170,10 @@ public class FullScmRepositoryImporter {
ArchiveEntry metadataEntry = tais.getNextEntry(); ArchiveEntry metadataEntry = tais.getNextEntry();
if (metadataEntry.getName().equals(METADATA_FILE_NAME)) { if (metadataEntry.getName().equals(METADATA_FILE_NAME)) {
RepositoryMetadata metadata = JAXB.unmarshal(new NoneClosingInputStream(tais), RepositoryMetadata.class); RepositoryMetadata metadata = JAXB.unmarshal(new NoneClosingInputStream(tais), RepositoryMetadata.class);
if (metadata != null && metadata.getPermissions() != null) {
return new HashSet<>(metadata.getPermissions()); return new HashSet<>(metadata.getPermissions());
}
return Collections.emptySet();
} else { } else {
throw new ImportFailedException( throw new ImportFailedException(
ContextEntry.ContextBuilder.noContext(), ContextEntry.ContextBuilder.noContext(),