Merge 9a4933f into 0677f35

hapifhir · Jan 24, 2018 · b957dbd · b957dbd
2 parents 0677f35 + 9a4933f
commit b957dbd
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/util/ResourceReferenceInfo.java
@@ -101,9 +101,15 @@ public boolean matchesInclude(Include theInclude) {
 			if (resourceDef != null) {
 				RuntimeSearchParam searchParamDef = resourceDef.getSearchParam(paramName);
 				if (searchParamDef!=null) {
-					if (searchParamDef.getPathsSplit().contains(myOwningResource + "." + myName)) {
-						return true;
+					final String myCompleteName = myOwningResource + "." + myName;
+					boolean matched = false;
+					for (String s : searchParamDef.getPathsSplit()) {
+						if (s.equals(myCompleteName) ||
+								       s.startsWith(myCompleteName + ".")) {
+							matched = true; break;
+						}
 					}
+					return matched;
 				}
 			}
 			return false;