Skip to content

Commit 3ccf057

Browse files
committed
[Java] Capture the referenced name when dealing with a simple encoded type within a composite. Issue #477.
1 parent 7201946 commit 3ccf057

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/CompositeType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ private Type processType(
364364
switch (nodeName)
365365
{
366366
case "type":
367-
type = addType(subTypeNode, subTypeName, new EncodedDataType(subTypeNode, givenName));
367+
type = addType(subTypeNode, subTypeName, new EncodedDataType(subTypeNode, givenName, referencedName));
368368
break;
369369

370370
case "enum":

sbe-tool/src/main/java/uk/co/real_logic/sbe/xml/EncodedDataType.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,19 @@ public class EncodedDataType extends Type
5050
*/
5151
public EncodedDataType(final Node node)
5252
{
53-
this(node, null);
53+
this(node, null, null);
5454
}
5555

5656
/**
5757
* Construct a new encodedDataType from XML Schema.
5858
*
59-
* @param node from the XML Schema Parsing
60-
* @param givenName for this node.
59+
* @param node from the XML Schema Parsing
60+
* @param givenName for this node.
61+
* @param referencedName of the type when created from a ref in a composite.
6162
*/
62-
public EncodedDataType(final Node node, final String givenName)
63+
public EncodedDataType(final Node node, final String givenName, final String referencedName)
6364
{
64-
super(node, givenName, null);
65+
super(node, givenName, referencedName);
6566

6667
primitiveType = PrimitiveType.get(getAttributeValue(node, "primitiveType"));
6768
final String lengthAttr = getAttributeValueOrNull(node, "length");

0 commit comments

Comments
 (0)