From: Pavel Aharoni <pa0916@att.com>
Date: Wed, 27 Sep 2017 07:18:38 +0000 (+0300)
Subject: [SDC-402] TDP 335705 test fix
X-Git-Tag: 1.6.6~22^2~76
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=f7cc6a3e9bf206b6500da5519f0abad8bf997fe7;p=sdc%2Fsdc-tosca.git

[SDC-402] TDP 335705 test fix

Change-Id: Ia9a72c70fe084bba250da316bc9d4d443c010c79
Signed-off-by: Pavel Aharoni <pa0916@att.com>
---

diff --git a/pom.xml b/pom.xml
index ba462d9..cf28b14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.openecomp.sdc.jtosca</groupId>
 	<artifactId>jtosca</artifactId>
-	<version>1.1.11-SNAPSHOT</version>
+	<version>1.1.12-SNAPSHOT</version>
         <name>sdc-jtosca</name>
 	<properties>
 
diff --git a/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetInput.java b/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetInput.java
index 14b0d4e..0c96b0f 100644
--- a/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetInput.java
+++ b/src/main/java/org/openecomp/sdc/toscaparser/api/functions/GetInput.java
@@ -73,9 +73,14 @@ public class GetInput extends Function {
 			}
 		}
 		if(inputDef != null) {
-			if (args.size() == 2 && args.get(1) instanceof Integer) {
-				if (inputDef.getDefault() != null && inputDef.getDefault() instanceof ArrayList) {
+			if (args.size() == 2 && inputDef.getDefault() != null && inputDef.getDefault() instanceof ArrayList){
+				if ( args.get(1) instanceof Integer
+						&& ((ArrayList) inputDef.getDefault()).size()> ((Integer)args.get(1)).intValue()) {
 					return ((ArrayList) inputDef.getDefault()).get(((Integer)args.get(1)).intValue());
+				}else{
+					ThreadLocalsHolder.getCollector().appendValidationIssue(new JToscaValidationIssue("JE274",(String.format(
+							"GetInputError: cannot resolve input Def name \"%s\", the expected structure is an argument with a name of input type list and a second argument with an index in the list", args.get(0)))));
+					return null;
 				}
 			}
 			return inputDef.getDefault();