Update TypeDefinition design

[yangtools.git] / yang / yang-model-util / src / main / java / org / opendaylight / yangtools / yang / model / util / type / ConcreteTypeBuilder.java

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 e61d0f4a6ce3eb1f054dfcbeb5265967c2cf4f6f..3431f92a6f0077647d9503b9f1db2753b9da8091 100644 (file)
--- 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;
         }