mqtt bug fix

gama-platform · Sep 4, 2018 · 517e6e2 · 517e6e2
1 parent 0886894
commit 517e6e2
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/ummisco.gama.network/models/Network/MQTT/Example_MQTT_Send.gaml b/ummisco.gama.network/models/Network/MQTT/Example_MQTT_Send.gaml
@@ -53,7 +53,7 @@ species NetworkingAgent skills:[network]{
 	reflex send3 when: cycle mod 10  = 8
 	{
 		write "sending message: " + self;
-		do send to:"send" contents:self;
+		do send to:"sender" contents:self;
 		do send to:"receive" contents:self;
 	}
 

diff --git a/...o.gama.serialize/src/ummisco/gama/serializer/gamaType/converters/SavedAgentConverter.java b/...o.gama.serialize/src/ummisco/gama/serializer/gamaType/converters/SavedAgentConverter.java
@@ -67,9 +67,12 @@ public void marshal(final Object arg0, final HierarchicalStreamWriter writer, fi
 		writer.endNode();
 
 		final Map<String, List<SavedAgent>> inPop = savedAgt.getInnerPopulations();
-		writer.startNode("innerPopulations");
-		context.convertAnother(inPop);
-		writer.endNode();
+		if(inPop!=null)
+		{
+			writer.startNode("innerPopulations");
+			context.convertAnother(inPop);
+			writer.endNode();			
+		}
 	}
 
 	@Override
@@ -91,11 +94,14 @@ public Object unmarshal(final HierarchicalStreamReader reader, final Unmarshalli
 		for (int ii = 0; ii < keys.size(); ii++) {
 			localData.put(keys.get(ii), datas.get(ii));
 		}
-
-		reader.moveDown();
 		Map<String, List<SavedAgent>> inPop = null;
-		inPop = (Map<String, List<SavedAgent>>) arg1.convertAnother(null, THashMap.class);
-		reader.moveUp();
+
+		if(reader.hasMoreChildren())
+		{
+			reader.moveDown();
+			inPop = (Map<String, List<SavedAgent>>) arg1.convertAnother(null, THashMap.class);
+			reader.moveUp();			
+		}
 
 		final SavedAgent agtToReturn = new SavedAgent(index, localData, inPop);