IDEMPIERE-3451 - after change from 72f4c205ac50 - the db port and db name are not correctly read from the actual properties configured

This commit is contained in:
Carlos Ruiz 2017-10-24 18:16:29 +02:00
parent 73f1764acd
commit 4008e59986
1 changed files with 5 additions and 2 deletions

View File

@ -320,7 +320,7 @@ public class ConfigurationData
initAppsServer();
setAppsServer(hostName);
// Database Server
initDatabase("");
initDatabase(Database.DB_POSTGRESQL);
String connectionName = getDatabaseDiscovered();
if (connectionName != null && connectionName.trim().length() > 0) {
setDatabaseName(resolveDatabaseName(connectionName));
@ -1169,7 +1169,10 @@ public class ConfigurationData
}
else
{
m_databaseConfig[index].init(this);
if ( ! p_properties.containsKey(ADEMPIERE_DB_NAME)
&& ! p_properties.containsKey(ADEMPIERE_DB_PORT)) {
m_databaseConfig[index].init(this);
}
if (p_panel != null)
{