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

https://sourceforge.net/tracker/?func=detail&aid=2799327&group_id=176962&atid=879335 

- Connection dialog not working when embedded server is turn on
This commit is contained in:
Heng Sin Low 2009-07-21 07:49:49 +00:00
parent 5c76bd07f6
commit 675c4d3ff5
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/src/org/compiere/db/CConnection.java
View File

@ -111,7 +111,7 @@ public class CConnection implements Serializable, Cloneable
{ {
//hengsin, zero setup for webstart client //hengsin, zero setup for webstart client
CConnection cc = null; CConnection cc = null;
if (apps_host != null && Adempiere.isWebStartClient()) if (apps_host != null && Adempiere.isWebStartClient() && !CConnection.isServerEmbedded())
{ {
cc = new CConnection(apps_host); cc = new CConnection(apps_host);
cc.setConnectionProfile(CConnection.PROFILE_LAN); cc.setConnectionProfile(CConnection.PROFILE_LAN);

2
base/src/org/compiere/db/CConnectionDialog.java
View File

@ -425,7 +425,7 @@ public class CConnectionDialog extends CDialog implements ActionListener
// bTestApps.setToolTipText(m_cc.getRmiUri()); // bTestApps.setToolTipText(m_cc.getRmiUri());
//cbOverwrite.setVisible(m_cc.isAppsServerOK(false)); //cbOverwrite.setVisible(m_cc.isAppsServerOK(false));
boolean rw = !m_cc.isAppsServerOK(false); boolean rw = CConnection.isServerEmbedded() ? true : !m_cc.isAppsServerOK(false);
// //
dbTypeLabel.setReadWrite(rw); dbTypeLabel.setReadWrite(rw);
dbTypeField.setReadWrite(rw); dbTypeField.setReadWrite(rw);

1
client/src/org/compiere/apps/ALogin.java
View File

@ -411,6 +411,7 @@ public final class ALogin extends CDialog
} // processWindowEvent } // processWindowEvent
private void validateAppServer() { private void validateAppServer() {
if (!CConnection.isServerEmbedded())
m_cc.testAppsServer(); m_cc.testAppsServer();
} }