Merge pull request #2791 from IBM/issue-2742-smallfix

Update Main
LinuxForHealth · Sep 21, 2021 · 33740d4 · 33740d4
2 parents 048f77b + b417b1f
commit 33740d4
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/Main.java b/fhir-persistence-schema/src/main/java/com/ibm/fhir/schema/app/Main.java
@@ -280,10 +280,8 @@ protected void buildCommonModel(PhysicalDataModel pdm, boolean fhirSchema, boole
             default:
                 throw new IllegalStateException("Unsupported db type: " + dbType);
             }
-        }
-
-        // Add the tenant and tenant_keys tables and any other admin schema stuff
-        if (dropAdmin) {
+        } else if (dropAdmin) {
+            // Add the tenant and tenant_keys tables and any other admin schema stuff
             FhirSchemaGenerator gen = new FhirSchemaGenerator(schema.getAdminSchemaName(), schema.getSchemaName(), isMultitenant());
             gen.buildAdminSchema(pdm);
         }