From 4008e599862bc6849b1bd4387736ff633e504b9d Mon Sep 17 00:00:00 2001
From: Carlos Ruiz <carg67@gmail.com>
Date: Tue, 24 Oct 2017 18:16:29 +0200
Subject: [PATCH] IDEMPIERE-3451 - after change from 72f4c205ac50 - the db port
 and db name are not correctly read from the actual properties configured

---
 .../src/org/compiere/install/ConfigurationData.java        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
index f5b3c9aea2..1d862e2312 100644
--- a/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
+++ b/org.adempiere.install/src/org/compiere/install/ConfigurationData.java
@@ -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)
 			{