From 48099bdf98b6fb451d536942c7739fb8d526a7c8 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 19 Mar 2018 14:52:04 +0100
Subject: [PATCH] Handling a Model returning NULL from getResult()
---
.../vips/core/service/ModelResourceImpl.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
index 6bc7f0c..6db9d15 100755
--- a/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
+++ b/src/main/java/no/nibio/vips/core/service/ModelResourceImpl.java
@@ -254,7 +254,12 @@ public class ModelResourceImpl implements ModelResource{
{
Model calledModel = ModelFactory.getInstance().getModelInstance(config.getModelId());
calledModel.setConfiguration(config);
- return Response.ok().entity(calledModel.getResult()).build();
+ List<Result> retVal = calledModel.getResult();
+ if(retVal != null)
+ {
+ return Response.ok().entity(calledModel.getResult()).build();
+ }
+ else throw new ModelExcecutionException("Model returned NULL Result");
}
catch(InstantiationException | IllegalAccessException | ConfigValidationException | ModelExcecutionException | NoSuchModelException | DuplicateModelIdException ex)
{
@@ -276,8 +281,12 @@ public class ModelResourceImpl implements ModelResource{
{
Model calledModel = ModelFactory.getInstance().getModelInstance(modelId);
calledModel.setConfiguration(config);
- List<Result> results = calledModel.getResult();
- return Response.ok().entity(results).build();
+ List<Result> results = calledModel.getResult();
+ if(results != null)
+ {
+ return Response.ok().entity(results).build();
+ }
+ else throw new ModelExcecutionException("Model returned NULL Result");
}
catch(Exception ex)
{
--
GitLab