Merge pull request #60 from ao508/npe-fix

Fallback on existing cmo label if NPE thrown
mskcc · Mar 31, 2023 · 8d80844 · 8d80844
2 parents 036c14f + 9fdbea1
commit 8d80844
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/main/java/org/mskcc/smile/service/impl/LabelGenMessageHandlingServiceImpl.java b/src/main/java/org/mskcc/smile/service/impl/LabelGenMessageHandlingServiceImpl.java
@@ -372,6 +372,10 @@ private String resolveAndUpdateCmoSampleLabel(String samplePrimaryId,
                 } else {
                     throw new IllegalStateException(e);
                 }
+            } catch (NullPointerException e2) {
+                LOG.error("NPE caught during label generation check: ", e2);
+                LOG.error("Falling back on existing cmo sample name for sample.");
+                return matchingSample.getCmoSampleName();
             }
             if (!updateRequired) {
                 LOG.info("No change detected for CMO sample label metadata - using "