X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fsal%2Fyang-prototype%2Fcode-generator%2Fyang-model-parser-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fyang%2Fmodel%2Fparser%2Fimpl%2FYangModelParserListenerImpl.java;h=6675b8068d6a892d231a02bc4fbd59479f564b36;hb=2a42a9c68c2149801f3c26d0f4c46cc857cffb00;hp=6d51868d98be3e025976c2f46366a1a882a8d5c4;hpb=6e72d221f55cfac71ee6e594b62cb5af9672614a;p=controller.git

diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
index 6d51868d98..6675b8068d 100644
--- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
+++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/main/java/org/opendaylight/controller/yang/model/parser/impl/YangModelParserListenerImpl.java
@@ -13,6 +13,7 @@ import java.net.URI;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -82,7 +83,7 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
     private String yangModelPrefix;
     private Date revision = new Date(0L);
 
-    private final DateFormat simpleDateFormat = new SimpleDateFormat(
+    final static DateFormat simpleDateFormat = new SimpleDateFormat(
             "yyyy-mm-dd");
     private final Stack<String> actualPath = new Stack<String>();
 
@@ -321,7 +322,9 @@ final class YangModelParserListenerImpl extends YangParserBaseListener {
                 if ("union".equals(typeName)) {
                     moduleBuilder.addUnionType(getActualPath());
                 } else {
-                    type = parseTypeBody(typeName, typeBody, getActualPath(),
+                    List<String> typePath = new ArrayList<String>(actualPath);
+                    typePath.remove(0);
+                    type = parseTypeBody(typeName, typeBody, typePath,
                             namespace, revision, yangModelPrefix);
                     moduleBuilder.setType(type, getActualPath());
                 }