561163 - Possible NPE in OdsEntityManager#loadTemplate()
Signed-off-by: Matthias Koller <m.koller@peak-solution.de>
diff --git a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java b/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java
index 527a186..71635cf 100644
--- a/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java
+++ b/src/main/java/org/eclipse/mdm/api/odsadapter/ODSEntityManager.java
@@ -454,7 +454,7 @@
*/
@Override
public Optional<TemplateTest> loadTemplate(Test test) {
- return Optional.of(ODSEntityFactory.extract(test).getMutableStore().get(TemplateTest.class));
+ return Optional.ofNullable(ODSEntityFactory.extract(test).getMutableStore().get(TemplateTest.class));
}
/**
@@ -462,6 +462,6 @@
*/
@Override
public Optional<TemplateTestStep> loadTemplate(TestStep testStep) {
- return Optional.of(ODSEntityFactory.extract(testStep).getMutableStore().get(TemplateTestStep.class));
+ return Optional.ofNullable(ODSEntityFactory.extract(testStep).getMutableStore().get(TemplateTestStep.class));
}
}
