Assign a default value to anu variable in namespace 0

OPCFoundation · Jan 27, 2022 · e512174 · e512174
1 parent b638bb4
commit e512174
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/Libraries/Opc.Ua.Server/Diagnostics/CustomNodeManager.cs b/Libraries/Opc.Ua.Server/Diagnostics/CustomNodeManager.cs
@@ -583,6 +583,17 @@ protected virtual void AddPredefinedNode(ISystemContext context, NodeState node)
                 m_predefinedNodes = new NodeIdDictionary<NodeState>();
             }
 
+            // assign a default value to any variable in namespace 0
+            if (node is BaseVariableState nodeStateVar)
+            {
+                if (nodeStateVar.NodeId.NamespaceIndex == 0 && nodeStateVar.Value == null)
+                {
+                    nodeStateVar.Value = TypeInfo.GetDefaultValue(nodeStateVar.DataType,
+                        nodeStateVar.ValueRank,
+                        Server.TypeTree);
+                }
+            }
+
             NodeState activeNode = AddBehaviourToPredefinedNode(context, node);
             m_predefinedNodes[activeNode.NodeId] = activeNode;
 

diff --git a/Stack/Opc.Ua.Core/Stack/State/NodeState.cs b/Stack/Opc.Ua.Core/Stack/State/NodeState.cs
@@ -1827,15 +1827,6 @@ protected BaseInstanceState UpdateChild(ISystemContext context, XmlDecoder decod
             // update any children.
             child.UpdateChildren(context, decoder);
 
-            // Set the status code to Good for BaseVariableState nodes with namespace 0
-            if (child is BaseVariableState childVar)
-            {
-                if (childVar.NodeId.NamespaceIndex == 0)
-                {
-                    childVar.StatusCode = StatusCodes.Good;
-                }
-            }
-
             return child;
         }