From 3aa7e83c4c95e3aaac3e78a4a190c3aa5717069f Mon Sep 17 00:00:00 2001 From: "Ben-kimon, Hofit (hb272c)" Date: Sun, 16 Sep 2018 17:31:41 +0300 Subject: [PATCH] fix parser issue update max hierarchy level from 10 to 20 Change-Id: Ic530b8d0d909be788c2f4af4a3c880fbd795c92c Issue-ID: SDC-1764 Signed-off-by: Ben-kimon, Hofit (hb272c) --- pom.xml | 2 +- src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java | 3 ++- version.properties | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index f0383b1..aa95d28 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.sdc.jtosca jtosca - 1.4.2-SNAPSHOT + 1.4.3-SNAPSHOT sdc-jtosca diff --git a/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java b/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java index f236a0a..b5ae4c4 100644 --- a/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java +++ b/src/main/java/org/onap/sdc/toscaparser/api/ToscaTemplate.java @@ -35,6 +35,7 @@ import org.yaml.snakeyaml.Yaml; public class ToscaTemplate extends Object { + public static final int MAX_LEVELS = 20; private static Logger log = LoggerFactory.getLogger(ToscaTemplate.class.getName()); // TOSCA template key names @@ -582,7 +583,7 @@ public class ToscaTemplate extends Object { // multi level nesting - RECURSIVE @SuppressWarnings("unchecked") private void _handleNestedToscaTemplatesWithTopology(TopologyTemplate tt) { - if(++nestingLoopCounter > 10) { + if(++nestingLoopCounter > MAX_LEVELS) { log.error("ToscaTemplate - _handleNestedToscaTemplatesWithTopology - Nested Topologies Loop: too many levels, aborting"); return; } diff --git a/version.properties b/version.properties index 0d94dfd..a54766f 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=4 -patch=2 +patch=3 base_version=${major}.${minor}.${patch} -- 2.16.6