Complex data types fix for passing TypeId to IComplexTypeInstance (#1371

)
OPCFoundation · Apr 20, 2021 · 087415b · 087415b
1 parent 77a3da8
commit 087415b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Stack/Opc.Ua.Core/Types/Encoders/BinaryDecoder.cs b/Stack/Opc.Ua.Core/Types/Encoders/BinaryDecoder.cs
@@ -228,7 +228,7 @@ public IEncodeable DecodeMessage(System.Type expectedType)
             }
 
             // read the message.
-            IEncodeable message = ReadEncodeable(null, actualType);
+            IEncodeable message = ReadEncodeable(null, actualType, absoluteId);
 
             // check that the max message size was not exceeded.
             if (m_context.MaxMessageSize > 0 && m_context.MaxMessageSize < (int)(m_istrm.Position - start))
@@ -2017,7 +2017,7 @@ private ExtensionObject ReadExtensionObject()
                     try
                     {
                         xmlDecoder.PushNamespace(element.NamespaceURI);
-                        IEncodeable body = xmlDecoder.ReadEncodeable(element.LocalName, systemType);
+                        IEncodeable body = xmlDecoder.ReadEncodeable(element.LocalName, systemType, extension.TypeId);
                         xmlDecoder.PopNamespace();
 
                         // update body.

diff --git a/Stack/Opc.Ua.Core/Types/Encoders/JsonDecoder.cs b/Stack/Opc.Ua.Core/Types/Encoders/JsonDecoder.cs
@@ -200,7 +200,7 @@ public IEncodeable DecodeMessage(System.Type expectedType)
             }
 
             // read the message.
-            IEncodeable message = ReadEncodeable("Body", actualType);
+            IEncodeable message = ReadEncodeable("Body", actualType, absoluteId);
 
             // return the message.
             return message;
@@ -1443,7 +1443,7 @@ public ExtensionObject ReadExtensionObject(string fieldName)
 
                 if (systemType != null)
                 {
-                    var encodeable = ReadEncodeable("Body", systemType);
+                    var encodeable = ReadEncodeable("Body", systemType, typeId);
                     if (encodeable == null)
                     {
                         return extension;

diff --git a/Stack/Opc.Ua.Core/Types/Encoders/XmlDecoder.cs b/Stack/Opc.Ua.Core/Types/Encoders/XmlDecoder.cs
@@ -550,7 +550,7 @@ public object ReadExtensionObjectBody(ExpandedNodeId typeId)
             if (systemType != null)
             {
                 PushNamespace(m_reader.NamespaceURI);
-                var encodeable = ReadEncodeable(m_reader.LocalName, systemType);
+                var encodeable = ReadEncodeable(m_reader.LocalName, systemType, typeId);
                 PopNamespace();
 
                 return encodeable;