From 074bcd5f04bd3c212c5137571c2390e6ef2a14f8 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Fri, 20 Dec 2019 08:01:46 +1100 Subject: [PATCH] fix stack overflow issue generating snapshots from type slices --- .../java/org/hl7/fhir/r5/conformance/ProfileUtilities.java | 2 +- pom.xml | 2 +- release.bat | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java index 1a22125c8..fe94103f9 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java @@ -680,7 +680,7 @@ public class ProfileUtilities extends TranslatingUtilities { List diffMatches = getDiffMatches(differential, cpath, diffCursor, diffLimit, profileName); // get a list of matching elements in scope // in the simple case, source is not sliced. - if (!currentBase.hasSlicing() || currentBase.getPath().equals(typeSlicingPath)) { + if (!currentBase.hasSlicing() || cpath.equals(typeSlicingPath)) { if (diffMatches.isEmpty()) { // the differential doesn't say anything about this item // so we just copy it in ElementDefinition outcome = updateURLs(url, webUrl, currentBase.copy()); diff --git a/pom.xml b/pom.xml index c4f1dc611..112f4252d 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 4.1.0 - 1.0.23-SNAPSHOT + 1.0.24-SNAPSHOT org.hl7.fhir.core diff --git a/release.bat b/release.bat index 0a4f6d30c..2232944c7 100644 --- a/release.bat +++ b/release.bat @@ -27,6 +27,9 @@ cd ..\latest-ig-publisher call git commit -a -m "Release new version %newver%-SNAPSHOT" call git push origin master cd ..\org.hl7.fhir.core + +call mvn eclipse:eclipse + call python c:\tools\zulip-api\zulip\zulip\send.py --stream committers/notification --subject "java core" -m "New Java Core v%newver%-SNAPSHOT released. New Validator at https://oss.sonatype.org/service/local/artifact/maven/redirect?r=snapshots&g=ca.uhn.hapi.fhir&a=org.hl7.fhir.validation.cli&v=%newver%-SNAPSHOT&e=jar, and also deployed at https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.validator.jar" --config-file zuliprc call python c:\tools\zulip-api\zulip\zulip\send.py --stream tooling/releases --subject "Validator" -m "New Validator @ https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.validator.jar (v%newver%)" --config-file zuliprc