midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.adempiere.install/src/org/compiere/install/ConfigurationData.java
View File

@ -320,7 +320,7 @@ public class ConfigurationData
initAppsServer(); initAppsServer();
setAppsServer(hostName); setAppsServer(hostName);
// Database Server // Database Server
initDatabase(""); initDatabase(Database.DB_POSTGRESQL);
String connectionName = getDatabaseDiscovered(); String connectionName = getDatabaseDiscovered();
if (connectionName != null && connectionName.trim().length() > 0) { if (connectionName != null && connectionName.trim().length() > 0) {
setDatabaseName(resolveDatabaseName(connectionName)); setDatabaseName(resolveDatabaseName(connectionName));
@ -1169,7 +1169,10 @@ public class ConfigurationData
} }
else 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) if (p_panel != null)
{ {