From 40a65fb2ccb6b6c7f47aaff81bea04213e6aaa66 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Mon, 27 Jun 2016 05:55:53 -0400 Subject: [PATCH] Try to fix test --- .../java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvc.java | 5 ++++- .../ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvc.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvc.java index 451cde41633..843b80aea16 100644 --- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvc.java +++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvc.java @@ -305,8 +305,11 @@ public abstract class BaseHapiTerminologySvc implements IHapiTerminologySvc { @Transactional(propagation=Propagation.REQUIRED) @Override public synchronized void saveDeferred() { - if (!myProcessDeferred || ((myConceptsToSaveLater.isEmpty() && myConceptLinksToSaveLater.isEmpty()))) { + if (!myProcessDeferred) { + return; + } else if (myConceptsToSaveLater.isEmpty() && myConceptLinksToSaveLater.isEmpty()) { processReindexing(); + return; } int codeCount = 0, relCount = 0; diff --git a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java index 11e2dacf5e9..5f603e423e3 100644 --- a/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java +++ b/hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java @@ -1493,6 +1493,7 @@ public class FhirResourceDaoDstu3Test extends BaseJpaDstu3Test { for (int i = 0; i < 10; i++) { Thread.sleep(100); preDates.add(new Date()); + Thread.sleep(100); patient.setId(id); patient.getName().get(0).getFamily().get(0).setValue(methodName + "_i"); ids.add(myPatientDao.update(patient, mySrd).getId().toUnqualified().getValue());