1 files changed, 11 insertions, 9 deletions
diff --git a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
index 80122296..bf9dd17f 100644
--- a/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
+++ b/aai-core/src/main/java/org/onap/aai/query/builder/GraphTraversalBuilder.java
@@ -226,16 +226,18 @@ public abstract class GraphTraversalBuilder<E> extends QueryBuilder<E> {
 	@Override
 	public QueryBuilder<Vertex> getVerticesByBooleanProperty(String key, Object value) {
 
-		boolean bValue = false;
-
-	    if(value instanceof String){
-	    	bValue = Boolean.valueOf(value.toString());
-		} else if(value instanceof Boolean){
-	    	bValue = (Boolean) value;
+		if(value!=null && !"".equals(value)) {
+			boolean bValue = false;
+	
+		    if(value instanceof String){//"true"
+		    	bValue = Boolean.valueOf(value.toString());
+			} else if(value instanceof Boolean){//true
+		    	bValue = (Boolean) value;
+			}
+	
+			traversal.has(key, bValue);
+			stepIndex++;
 		}
-
-		traversal.has(key, bValue);
-		stepIndex++;
 		return (QueryBuilder<Vertex>) this;
 	}