diff options
Diffstat (limited to 'common-be/src/main')
| -rw-r--r-- | common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java index f88514ac49..adfef9c426 100644 --- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java +++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/PropertyDataDefinition.java @@ -173,11 +173,8 @@ public class PropertyDataDefinition extends ToscaDataDefinition { } public ToscaGetFunctionType getToscaGetFunctionType() { - if (isToscaGetFunction()) { - if (toscaFunction != null) { - return ((ToscaGetFunctionDataDefinition) toscaFunction).getFunctionType(); - } - return toscaGetFunctionType; + if (isToscaGetFunction() && toscaFunction != null) { + return ((ToscaGetFunctionDataDefinition) toscaFunction).getFunctionType(); } return null; @@ -337,10 +334,10 @@ public class PropertyDataDefinition extends ToscaDataDefinition { @JsonIgnoreProperties public boolean isToscaGetFunction() { - return this.toscaGetFunctionType != null || (this.toscaFunction != null + return this.toscaFunction != null && (this.toscaFunction.getType() == ToscaFunctionType.GET_ATTRIBUTE - || this.toscaFunction.getType() == ToscaFunctionType.GET_INPUT - || this.toscaFunction.getType() == ToscaFunctionType.GET_PROPERTY)); + || this.toscaFunction.getType() == ToscaFunctionType.GET_INPUT + || this.toscaFunction.getType() == ToscaFunctionType.GET_PROPERTY); } @JsonIgnoreProperties |