Resolved conflict

DANS-KNAW · Aug 1, 2019 · 0ba5256 · 0ba5256
2 parents 6a97ad0 + 1c9e10c
commit 0ba5256
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/scala/nl.knaw.dans.easy.stage/dataset/EMD.scala b/src/main/scala/nl.knaw.dans.easy.stage/dataset/EMD.scala
@@ -102,7 +102,10 @@ object EMD extends DebugEnhancedLogging {
     val msgForDataManager = s.bagitDir.toPath.resolve(depositorInfoDir).resolve("message-from-depositor.txt")
     if (Files.exists(msgForDataManager)) {
       val content = new String(Files.readAllBytes(msgForDataManager), StandardCharsets.UTF_8)
-      emd.getEmdOther.getEasRemarks.add(new BasicRemark(s"Message for the Datamanager: $content"))
+      if (content.isBlank)
+        logger.debug("message-from-depositor.txt was found but was empty, not setting a remark")
+      else
+        emd.getEmdOther.getEasRemarks.add(new BasicRemark(s"Message for the Datamanager: $content"))
     }
     else {
       logger.debug("message-from-depositor.txt not found, not setting a remark")