X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ECOMP-PDP%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fpolicy%2Fxacml%2Fpdp%2Fstd%2Ffunctions%2FFunctionDefinitionCustomRegexpMatch.java;h=5b84ab0f65d2de5bf9c96ef16c75bd8d66168917;hb=e92ff832cf993db876f22b2d27562fedf59f5043;hp=806df2193fb0c10bc285042820f36ccd2f7a74e3;hpb=570290dc6ba8198e653022c2f6f8e5d01cfa8d1b;p=policy%2Fengine.git

diff --git a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java b/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java
index 806df2193..5b84ab0f6 100644
--- a/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java
+++ b/ECOMP-PDP/src/main/java/org/openecomp/policy/xacml/pdp/std/functions/FunctionDefinitionCustomRegexpMatch.java
@@ -41,7 +41,7 @@ import com.att.research.xacmlatt.pdp.std.functions.FunctionDefinitionBase;
  * and returning a <code>Boolean</code> for whether the regular expression matches the string representation of the first argument.
  * 
  * 
- * @version $Revision: 0.1 $
+ * @version $Revision: 0.2 $
  * 
  * @param <I> the java class for the data type of the function Input arguments
  */
@@ -107,7 +107,15 @@ public class FunctionDefinitionCustomRegexpMatch<I> extends FunctionDefinitionBa
 		regexpValue = elementValueString.substring(0,(elementValueString.length()- regexpValue.length()));
 		elementValueString = elementValueString.substring(regexpValue.length(),(elementValueString.length()));
 		// 
-		
+		// Supporting multiple values in the element and be able to query them. 
+		if(elementValueString.contains(",")){
+			String[] elements = elementValueString.split(",");
+			for(int i=0; i<elements.length; i++){
+				if(elements[i].trim().matches(regexpValue)) {
+					return ER_TRUE;
+				}
+			}
+		}
 		if (elementValueString.matches(regexpValue)) {
 			return ER_TRUE;
 		} else {