Changeset 48 in tmcsimulator-scriptbuilder for trunk/src/scriptbuilder/structures

Timestamp:

08/08/2017 09:54:36 AM (9 years ago)

Author:

bmcguffin

Message:

Added guards to protect against null pointer errors when dealing with CAD data.

File:

• trunk/src/scriptbuilder/structures/TimeSlice.java (modified) (2 diffs)

trunk/src/scriptbuilder/structures/TimeSlice.java

@@ -223 +223 @@
         output += thisIncident.name + XMLWriter.closeTag(ELEMENT.INCIDENT.tag);
 
-        if (cadData.hasCadData() || containsCADIncidentEvent())
+        if ((cadData != null && cadData.hasCadData()) || containsCADIncidentEvent())
         {
             output += XMLWriter.openTag(ELEMENT.CAD_DATA.tag);
-            output += cadData.toXML();
+            if (cadData != null)
+            {
+                output += cadData.toXML();
+            }
 
             if (containsCADIncidentEvent())
@@ -251 +254 @@
         }
 
-        if (cadData.hasGeneralInfo())
+        if (cadData != null && cadData.hasGeneralInfo())
         {
             output += XMLWriter.openTag(ELEMENT.GENERAL_INFO.tag);