X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-model-util%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fmodel%2Futil%2Ftype%2FConcreteTypeBuilder.java;h=3431f92a6f0077647d9503b9f1db2753b9da8091;hb=c3bb225b72f0d6201de21720ca378660d9fa8f30;hp=e61d0f4a6ce3eb1f054dfcbeb5265967c2cf4f6f;hpb=a16601d8bde2ed005790681514b44aca4f079950;p=yangtools.git

diff --git a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java
index e61d0f4a6c..3431f92a6f 100644
--- a/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java
+++ b/yang/yang-model-util/src/main/java/org/opendaylight/yangtools/yang/model/util/type/ConcreteTypeBuilder.java
@@ -41,7 +41,8 @@ public abstract class ConcreteTypeBuilder<T extends TypeDefinition<T>> extends D
     @Override
     public final T build() {
         final T base = getBaseType();
-        if (Objects.equals(getDefaultValue(), base.getDefaultValue()) && Objects.equals(getUnits(), base.getUnits())) {
+        if (Objects.equals(getDefaultValue(), base.getDefaultValue().orElse(null))
+                && Objects.equals(getUnits(), base.getUnits().orElse(null))) {
             return base;
         }