quick fix if for migration if main model is null.

90aa8e7f · Benedikt Zoennchen · 4e97e7bb · 90aa8e7f
Commit 90aa8e7f authored Jun 02, 2020 by Benedikt Zoennchen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java ...r/src/org/vadere/simulator/projects/io/JsonConverter.java +2 -1

No files found.
--- a/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java
+++ b/VadereSimulator/src/org/vadere/simulator/projects/io/JsonConverter.java
@@ -53,7 +53,8 @@ public class JsonConverter {
 		AttributesSimulation attributesSimulation = StateJsonConverter.deserializeAttributesSimulationFromNode(scenarioNode.get(AttributesSimulation.JSON_KEY));
 		AttributesPsychology attributesPsychology = StateJsonConverter.deserializeAttributesPsychologyFromNode(scenarioNode.get(AttributesPsychology.JSON_KEY));
 		JsonNode attributesModelNode = scenarioNode.get("attributesModel");
-		String mainModel = scenarioNode.get(StateJsonConverter.MAIN_MODEL_KEY).isNull() ? null : scenarioNode.get(StateJsonConverter.MAIN_MODEL_KEY).asText();
+		String mainModel = (!scenarioNode.has(StateJsonConverter.MAIN_MODEL_KEY) ||
+				scenarioNode.get(StateJsonConverter.MAIN_MODEL_KEY).isNull()) ? null : scenarioNode.get(StateJsonConverter.MAIN_MODEL_KEY).asText();
 		List<Attributes> attributesModel = StateJsonConverter.deserializeAttributesListFromNode(attributesModelNode);
 		Topography topography = StateJsonConverter.deserializeTopographyFromNode(scenarioNode.get("topography"));
 		StimulusInfoStore stimulusInfoStore = StateJsonConverter.deserializeStimuliFromArrayNode(scenarioNode.get("stimulusInfos"));