Merge branch 'master' into rel_5_1_0

2020-06-15 18:22:06 -04:00
parent 8aa322caf1 1badb96db8
commit 3c8565f503
5 changed files with 170 additions and 3 deletions
--- a/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
+++ b/src/main/java/ca/uhn/fhir/jpa/starter/FhirServerConfigCommon.java
@@ -134,7 +134,14 @@ public class FhirServerConfigCommon {

  @Bean
  public PartitionSettings partitionSettings() {
-    return new PartitionSettings();
+    PartitionSettings retVal = new PartitionSettings();
+
+    // Partitioning
+    if (HapiProperties.getPartitioningMultitenancyEnabled()) {
+      retVal.setPartitioningEnabled(true);
+    }
+
+    return retVal;
  }