Merge remote-tracking branch 'origin/master'

Author: mjpt777

README.md

@@ -14,9 +14,9 @@ An XSD for SBE specs can be found
 For the latest version information and changes see the [Change Log](https://github.com/real-logic/simple-binary-encoding/wiki/Change-Log) with **downloads** at [Maven Central](http://search.maven.org/#search%7Cga%7C1%7Csbe). 
 
 The Java and C++ SBE implementations are designed with work very efficiently with the
-[Aeron](https://github.com/real-logic/Aeron) messaging system for low-latency and
+[Aeron](https://github.com/real-logic/aeron) messaging system for low-latency and
 high-throughput communications. The Java SBE implementation has a dependency on
-[Agrona](https://github.com/real-logic/Agrona) for its buffer implementations.
+[Agrona](https://github.com/real-logic/agrona) for its buffer implementations.
 
 License (See LICENSE file for full license)
 -------------------------------------------

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

@@ -364,7 +364,7 @@ private Type processType(
         switch (nodeName)
         {
             case "type":
-                type = addType(subTypeNode, subTypeName, new EncodedDataType(subTypeNode, givenName));
+                type = addType(subTypeNode, subTypeName, new EncodedDataType(subTypeNode, givenName, referencedName));
                 break;
 
             case "enum":

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

@@ -50,18 +50,19 @@ public class EncodedDataType extends Type
      */
     public EncodedDataType(final Node node)
     {
-        this(node, null);
+        this(node, null, null);
     }
 
     /**
      * Construct a new encodedDataType from XML Schema.
      *
-     * @param node      from the XML Schema Parsing
-     * @param givenName for this node.
+     * @param node           from the XML Schema Parsing
+     * @param givenName      for this node.
+     * @param referencedName of the type when created from a ref in a composite.
      */
-    public EncodedDataType(final Node node, final String givenName)
+    public EncodedDataType(final Node node, final String givenName, final String referencedName)
     {
-        super(node, givenName, null);
+        super(node, givenName, referencedName);
 
         primitiveType = PrimitiveType.get(getAttributeValue(node, "primitiveType"));
         final String lengthAttr = getAttributeValueOrNull(node, "length");