From 26dfbff39b0e9197bbc477a67ab99c36d5ed579a Mon Sep 17 00:00:00 2001
From: Ludovic Claude <ludovic.claude54@gmail.com>
Date: Tue, 30 Jan 2018 00:47:23 +0100
Subject: [PATCH] Fix convertion to json of experiment
---
src/main/java/eu/hbp/mip/model/Experiment.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/java/eu/hbp/mip/model/Experiment.java b/src/main/java/eu/hbp/mip/model/Experiment.java
index fff0611d7..3c2d3654c 100644
--- a/src/main/java/eu/hbp/mip/model/Experiment.java
+++ b/src/main/java/eu/hbp/mip/model/Experiment.java
@@ -14,6 +14,8 @@ import eu.hbp.mip.utils.TypesConvert;
import eu.hbp.mip.woken.messages.query.filters.FilterRule;
import eu.hbp.mip.woken.messages.variables.FeatureIdentifier;
import org.hibernate.annotations.Cascade;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import scala.None$;
import scala.Option;
import scala.collection.JavaConversions;
@@ -33,6 +35,8 @@ import java.util.UUID;
@Table(name = "`experiment`")
public class Experiment {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Experiment.class);
+
private static final Gson gson = new Gson();
@Id
@@ -194,7 +198,7 @@ public class Experiment {
exp.add("validations", jsonValidations);
}
- if (this.result != null)
+ if (this.result != null && !this.hasServerError)
{
exp.remove("result");
JsonArray jsonResult = parser.parse(this.result).getAsJsonArray();
--
GitLab