From 14b5d88530889a5c9606719f77b5c97f86401a9b Mon Sep 17 00:00:00 2001
From: Matti Uusitalo <matti.uusitalo@fi.fujitsu.com>
Date: Wed, 12 Dec 2018 14:22:38 +0200
Subject: [PATCH] Filter Extensions from enablewhen evaluation

---
 hapi-fhir-validation/pom.xml                                 | 2 +-
 .../hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java   | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/hapi-fhir-validation/pom.xml b/hapi-fhir-validation/pom.xml
index aafcccf3b3e..ed93cefb152 100644
--- a/hapi-fhir-validation/pom.xml
+++ b/hapi-fhir-validation/pom.xml
@@ -11,7 +11,7 @@
 
 	<artifactId>hapi-fhir-validation</artifactId>
 	<packaging>bundle</packaging>
-	<version>3.6.1-PHRFIX</version>
+	<version>3.6.2-PHRFIX</version>
 
 	<name>HAPI FHIR - Validation</name>
 
diff --git a/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java b/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java
index 2f4063de51f..b78d052cea6 100644
--- a/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java
+++ b/hapi-fhir-validation/src/main/java/org/hl7/fhir/r4/validation/DefaultEnableWhenEvaluator.java
@@ -142,8 +142,13 @@ public class DefaultEnableWhenEvaluator implements IEnableWhenEvaluator {
         return item.getChildrenByName(ANSWER_ELEMENT)
                 .stream()
                 .flatMap(c -> c.getChildren().stream())
+                .filter(DefaultEnableWhenEvaluator::notExtension)
                 .collect(Collectors.toList());
     }
+    
+    private static boolean notExtension(Element e) {
+    	return !Extension.class.isAssignableFrom(e.getClass());
+    }
 
     private boolean compareCodingAnswer(Coding expectedAnswer, Coding actualAnswer, QuestionnaireItemOperator questionnaireItemOperator) {
         boolean result = compareSystems(expectedAnswer, actualAnswer) && compareCodes(expectedAnswer, actualAnswer);