- IED server: fixed value initialization of array elements

- fixed merging problem in LogicalNode.java

src/iec61850/server/impl/ied_server.c

@@ -302,6 +302,20 @@ installDefaultValuesForDataAttribute(IedServer self, LogicalDevice* ld, DataAttr
     int childPosition = strlen(objectReference);
     int childCompIdPos = strlen(componentId);
 
+    if (dataAttribute->elementCount > 0) {
+        int subIdx = 0;
+
+        DataAttribute* subDataAttribute = (DataAttribute*) dataAttribute->firstChild;
+
+        while (subDataAttribute != NULL) {
+            installDefaultValuesForDataAttribute(self, ld, subDataAttribute, objectReference, childPosition, subIdx, componentId, childCompIdPos);
+
+            subIdx++;
+
+            subDataAttribute = (DataAttribute*) subDataAttribute->sibling;
+        }
+    }
+    else {
         DataAttribute* subDataAttribute = (DataAttribute*) dataAttribute->firstChild;
 
         while (subDataAttribute != NULL) {
@@ -309,6 +323,7 @@ installDefaultValuesForDataAttribute(IedServer self, LogicalDevice* ld, DataAttr
 
             subDataAttribute = (DataAttribute*) subDataAttribute->sibling;
         }
+    }
 }
 
 static void

tools/model_generator/src/com/libiec61850/scl/model/LogicalNode.java

@@ -245,7 +245,7 @@ public class LogicalNode implements DataModelNode {
 		    if (subDataAttribute == null)
 		        System.out.println("subelement with name " + sdiName + " not found!");
 		    
-		    parseDataAttributeNodes(sdiNode, subDataAttribute);
+		    parseDataAttributeNodes(sdiNode, subDataAttribute, -1);
 		    
 		    parseSubDataInstances(sdiNode,  subDataAttribute);
 		}