From 76d26a1a26010bd475d78441d3489e5cd56bf532 Mon Sep 17 00:00:00 2001 From: James Agnew Date: Wed, 5 Aug 2015 10:09:17 -0400 Subject: [PATCH] Backport fix to #203 from DSTU2 branch --- .../fhir/jpa/dao/FhirResourceDaoQuestionnaireAnswersDstu2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireAnswersDstu2.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireAnswersDstu2.java index 31ef0db18b6..579bedcdf56 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireAnswersDstu2.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/FhirResourceDaoQuestionnaireAnswersDstu2.java @@ -46,7 +46,7 @@ public class FhirResourceDaoQuestionnaireAnswersDstu2 extends FhirResourceDaoDst super.validateResourceForStorage(theResource); QuestionnaireAnswers qa = (QuestionnaireAnswers) theResource; - if (qa.getQuestionnaire().getReference().isEmpty()) { + if (qa == null || qa.getQuestionnaire() == null || qa.getQuestionnaire().getReference() == null || qa.getQuestionnaire().getReference().isEmpty()) { return; }