Try to fix test

hapifhir · Jun 27, 2016 · 40a65fb · 40a65fb
1 parent c2dbcc7
commit 40a65fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 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
@@ -305,8 +305,11 @@ private void populateVersion(TermConcept theNext, TermCodeSystemVersion theCodeS
 	@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/...fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java b/...fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/dao/dstu3/FhirResourceDaoDstu3Test.java
@@ -1493,6 +1493,7 @@ public void testHistoryWithFromAndTo() throws Exception {
 		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());