Skip to content

Commit c5e56c2

Browse files
committed
Fixes NPE when deserializing a spimdata object
1 parent 8c074d8 commit c5e56c2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

src/main/java/sc/fiji/bdvpg/scijava/adapter/AbstractSpimdataAdapter.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ public AbstractSpimData<?> deserialize(JsonElement jsonElement, Type type,
115115
SourceAndConverterService sacService = sacSerializer.getScijavaContext()
116116
.getService(SourceAndConverterService.class);
117117
List<AbstractSpimData<?>> asds = sacService.getSpimDatasets().stream().filter(
118-
asd -> sacService.getMetadata(asd, SPIM_DATA_LOCATION).equals(finalDataLocation)).collect(
118+
asd -> {
119+
Object location = sacService.getMetadata(asd, SPIM_DATA_LOCATION);
120+
return location != null && location.equals(finalDataLocation);
121+
}).collect(
119122
Collectors.toList());
120123

121124
// SpimData not found

0 commit comments

Comments
 (0)