Merge branch 'support-4.0' of https://github.com/Evolveum/midpoint in…

…to support-4.0
Evolveum · Mar 18, 2020 · ae89372 · ae89372
2 parents 7f9b57c + 58945ad
commit ae89372
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/.../main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java b/.../main/java/com/evolveum/midpoint/common/refinery/LayerRefinedAttributeDefinitionImpl.java
@@ -418,13 +418,17 @@ public String getDisplayName() {
     @NotNull
     @Override
     public ResourceAttribute<T> instantiate() {
-        return refinedAttributeDefinition.instantiate();
+        @NotNull ResourceAttribute<T> resourceAttribute = refinedAttributeDefinition.instantiate();
+        resourceAttribute.setDefinition(this);
+        return resourceAttribute;
     }
 
     @NotNull
     @Override
     public ResourceAttribute<T> instantiate(QName name) {
-        return refinedAttributeDefinition.instantiate(name);
+        @NotNull ResourceAttribute<T> resourceAttribute = refinedAttributeDefinition.instantiate(name);
+        resourceAttribute.setDefinition(this);
+        return resourceAttribute;
     }
 
     @Override