Avoid NPE from serie.getFirstDatasetFileForCurrentSerie()

fli-iam · Oct 20, 2023 · f05f38c · f05f38c
1 parent 1280e83
commit f05f38c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/dto/Serie.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/dto/Serie.java
@@ -245,10 +245,11 @@ public void setSequenceName(String sequenceName) {
 
 	public DatasetFile getFirstDatasetFileForCurrentSerie() {
 		if (getDatasets() == null
-				|| getDatasets().get(0) == null
-				|| getDatasets().get(0).getExpressionFormats() == null
-				|| getDatasets().get(0).getExpressionFormats().get(0) == null
-				|| getDatasets().get(0).getExpressionFormats().get(0).getDatasetFiles() == null) {
+			|| getDatasets().get(0) == null
+			|| getDatasets().get(0).getExpressionFormats() == null
+			|| getDatasets().get(0).getExpressionFormats().get(0) == null
+			|| getDatasets().get(0).getExpressionFormats().get(0).getDatasetFiles() == null
+			|| getDatasets().get(0).getExpressionFormats().get(0).getDatasetFiles().get(0) == null) {
 			return null;
 		}
 		return getDatasets().get(0).getExpressionFormats().get(0).getDatasetFiles().get(0);

diff --git a/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/service/ImporterService.java b/shanoir-ng-datasets/src/main/java/org/shanoir/ng/importer/service/ImporterService.java
@@ -221,7 +221,7 @@ private Set<DatasetAcquisition> generateAcquisitions(Examination examination, Im
                     try {
                         dicomAttributes = dicomProcessing.getDicomObjectAttributes(serie.getFirstDatasetFileForCurrentSerie(), serie.getIsEnhanced());
                     } catch (IOException e) {
-                        throw new ShanoirException("Unable to retrieve dicom attributes in file " + serie.getFirstDatasetFileForCurrentSerie().getPath(), e);
+                        throw new ShanoirException("Unable to retrieve dicom attributes in serie: " + serie.getSeriesDescription(), e);
                     }
 
                     // Generate acquisition object with all sub objects : datasets, protocols, expressions, ...