Skip to content

Commit 026eee3

Browse files
jmeznaTFaga
authored andcommitted
config: do not set nested objects if they are empty
1 parent af1de3a commit 026eee3

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

components/cdi/weld/src/main/java/com/kumuluz/ee/configuration/cdi/interceptors/ConfigBundleInterceptor.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,9 @@ private boolean processConfigBundleBeanSetters(Object target, Class targetClass,
137137
processedClassRelations, -1, watchNestedClass);
138138

139139
// invoke setter method with initialised instance
140-
method.invoke(target, nestedTarget);
140+
if (nestedTarget != null) {
141+
method.invoke(target, nestedTarget);
142+
}
141143

142144
// process arrays
143145
} else {
@@ -157,8 +159,11 @@ private boolean processConfigBundleBeanSetters(Object target, Class targetClass,
157159
// process list of nested classes
158160
} else {
159161
for (int i = 0; i < Array.getLength(array); i++) {
160-
Array.set(array, i, processNestedObject(targetClass, method, componentType, keyPrefix,
161-
processedClassRelations, i, watchNestedClass));
162+
Object nestedTarget = processNestedObject(targetClass, method, componentType, keyPrefix,
163+
processedClassRelations, i, watchNestedClass);
164+
if (nestedTarget != null) {
165+
Array.set(array, i, nestedTarget);
166+
}
162167

163168
}
164169
}

0 commit comments

Comments
 (0)