fix(engine): fail on db metadata initialization errors (camunda#3632)

related to camunda#3563
puppyhang · Aug 9, 2023 · 587c179 · 587c179
1 parent 81ee379
commit 587c179
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/engine/src/main/java/org/camunda/bpm/engine/impl/cfg/ConfigurationLogger.java b/engine/src/main/java/org/camunda/bpm/engine/impl/cfg/ConfigurationLogger.java
@@ -17,7 +17,6 @@
 package org.camunda.bpm.engine.impl.cfg;
 
 import javax.naming.NamingException;
-
 import org.camunda.bpm.engine.ProcessEngineException;
 import org.camunda.bpm.engine.impl.ProcessEngineLogger;
 
@@ -91,10 +90,10 @@ public ProcessEngineException invalidPropertyValue(String propertyName, String p
       "Invalid value '{}' for configuration property '{}'.", propertyValue, propertyName), e);
   }
 
-  public void databaseConnectionAccessException(Exception cause) {
-    logError(
+  public ProcessEngineException databaseConnectionAccessException(Exception cause) {
+    return new ProcessEngineException(exceptionMessage(
       "012",
-      "Exception on accessing the database connection: {}", cause.getMessage());
+      "Exception on accessing the database connection: {}", cause.getMessage()), cause);
   }
 
   public void databaseConnectionCloseException(Exception cause) {

diff --git a/engine/src/main/java/org/camunda/bpm/engine/impl/cfg/ProcessEngineConfigurationImpl.java b/engine/src/main/java/org/camunda/bpm/engine/impl/cfg/ProcessEngineConfigurationImpl.java
@@ -1737,7 +1737,7 @@ public void initDatabaseType() {
       initDatabaseVendorAndVersion(databaseMetaData);
 
     } catch (SQLException e) {
-      LOG.databaseConnectionAccessException(e);
+      throw LOG.databaseConnectionAccessException(e);
     } finally {
       try {
         if (connection != null) {