summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Krishna Verma <ram.krishna.verma@est.tech>2019-08-01 10:29:17 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-01 10:29:17 +0000
commit80540215adf4960922c57d8ba21a6fa645732595 (patch)
tree359ea8b83ef957fc94f65d47f56e9b5643e62cc8
parent0c7d117a4cb41913101cfce1e8667782fd6abf21 (diff)
parent9f5537344f03df1cd1738baa3cf9c7545a73afd7 (diff)
Merge "Change to fix issues in overridden validations of ParameterGroups"1.5.1
-rw-r--r--common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java7
1 files changed, 6 insertions, 1 deletions
diff --git a/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java b/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
index ad2eb695..fd680451 100644
--- a/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
+++ b/common-parameters/src/main/java/org/onap/policy/common/parameters/GroupValidationResult.java
@@ -109,7 +109,12 @@ public class GroupValidationResult extends CommonGroupValidationResult {
// Nested parameter groups are allowed
if (ParameterGroup.class.isAssignableFrom(fieldType)) {
- return new GroupValidationResult((ParameterGroup) fieldObject);
+ if (null != fieldObject) {
+ return ((ParameterGroup) fieldObject).validate();
+ }
+ else {
+ return new GroupValidationResult((ParameterGroup) fieldObject);
+ }
}
// Nested maps of parameter groups are allowed