Refs #20619. Fix inheritance with aliases

Signed-off-by: Ricardo González Moreno <[email protected]>
eProsima · Mar 12, 2024 · 5400105 · 5400105
1 parent 37fc90c
commit 5400105
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/AliasTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/AliasTypeCode.java
@@ -26,6 +26,18 @@ public AliasTypeCode(
         super(scope, name);
     }
 
+    public boolean isHasKey()
+    {
+        boolean returnedValue = false;
+
+        if (getContentTypeCode() instanceof StructTypeCode)
+        {
+            returnedValue = ((StructTypeCode)getContentTypeCode()).isHasKey();
+        }
+
+        return returnedValue;
+    }
+
     @Override
     public long maxSerializedSize(
             long current_alignment)

diff --git a/src/main/java/com/eprosima/fastdds/idl/parser/typecode/StructTypeCode.java b/src/main/java/com/eprosima/fastdds/idl/parser/typecode/StructTypeCode.java
@@ -34,9 +34,9 @@ public boolean isHasKey()
     {
         boolean returnedValue = false;
 
-        if (getInheritance() != null)
+        if (getEnclosedInheritance() != null)
         {
-            returnedValue |= ((StructTypeCode)getInheritance()).isHasKey();
+            returnedValue |= ((StructTypeCode)getEnclosedInheritance()).isHasKey();
         }
 
         for (int count = 0; count < getMembers().size() && !returnedValue; ++count)
@@ -143,9 +143,9 @@ public long maxPlainTypeSerializedSize(
 
         long initial_alignment = current_alignment;
 
-        if (getInheritance() != null)
+        if (getEnclosedInheritance() != null)
         {
-            current_alignment += ((StructTypeCode)getInheritance()).maxPlainTypeSerializedSize(current_alignment, align64);
+            current_alignment += ((StructTypeCode)getEnclosedInheritance()).maxPlainTypeSerializedSize(current_alignment, align64);
         }
 
         for (Member member : getMembers())

diff --git a/thirdparty/idl-parser b/thirdparty/idl-parser