honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1015 from jschneid-nmdp/resolve-term-upload-deferred-short-circuit 

avoid potential short circuit during saveDeferred processing of uploaded (e.g. LOINC) terminology
This commit is contained in:
James Agnew 2018-06-27 10:33:06 -04:00 committed by GitHub
parent f7029b9a0f b2853b3f9d
commit 8c849b16a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/term/BaseHapiTerminologySvcImpl.java
View File

@ -850,15 +850,16 @@ public abstract class BaseHapiTerminologySvcImpl implements IHapiTerminologySvc,
return; return;
} else if (myDeferredConcepts.isEmpty() && myConceptLinksToSaveLater.isEmpty()) { } else if (myDeferredConcepts.isEmpty() && myConceptLinksToSaveLater.isEmpty()) {
processReindexing(); processReindexing();
return;
} }
TransactionTemplate tt = new TransactionTemplate(myTransactionMgr); TransactionTemplate tt = new TransactionTemplate(myTransactionMgr);
tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW); tt.setPropagationBehavior(TransactionTemplate.PROPAGATION_REQUIRES_NEW);
tt.execute(t -> { if(!myDeferredConcepts.isEmpty() || !myConceptLinksToSaveLater.isEmpty()) {
processDeferredConcepts(); tt.execute(t -> {
return null; processDeferredConcepts();
}); return null;
});
}
if (myDeferredValueSets.size() > 0) { if (myDeferredValueSets.size() > 0) {
tt.execute(t -> { tt.execute(t -> {