Merge pull request #67 from ao508/handle-npe

Handle NPE in getNextSampleIncrement()
mskcc · Jul 31, 2023 · 5b7081d · 5b7081d
2 parents 51d4da2 + 542a5b6
commit 5b7081d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/mskcc/smile/service/impl/CmoLabelGeneratorServiceImpl.java b/src/main/java/org/mskcc/smile/service/impl/CmoLabelGeneratorServiceImpl.java
@@ -462,6 +462,10 @@ private Integer getNextSampleIncrement(List<SampleMetadata> samples) {
         // to prevent accidentally giving samples the same counter
         Integer maxIncrement = 0;
         for (SampleMetadata sample : samples) {
+            // skip samples without a defined cmo sample label
+            if (StringUtils.isBlank(sample.getCmoSampleName())) {
+                continue;
+            }
             // skip cell line samples
             if (CMO_CELLLINE_ID_REGEX.matcher(sample.getCmoSampleName()).find()) {
                 continue;