* [ 1656849 ] WAN: every time when a query fails is tried to run locally
This commit is contained in:
parent
7a4012db51
commit
2b0729720e
|
@ -348,7 +348,7 @@ public final class ALogin extends CDialog
|
||||||
m_cc.testAppsServer();
|
m_cc.testAppsServer();
|
||||||
if (m_cc.getAppsServerException() != null)
|
if (m_cc.getAppsServerException() != null)
|
||||||
{
|
{
|
||||||
if (m_cc.isServerObjects())
|
if (m_cc.isRMIoverHTTP())
|
||||||
{
|
{
|
||||||
m_cc.getAppsServerException().printStackTrace();
|
m_cc.getAppsServerException().printStackTrace();
|
||||||
JOptionPane.showMessageDialog(null,
|
JOptionPane.showMessageDialog(null,
|
||||||
|
@ -361,7 +361,13 @@ public final class ALogin extends CDialog
|
||||||
private void connectToDatabase() {
|
private void connectToDatabase() {
|
||||||
//Check connection
|
//Check connection
|
||||||
DB.setDBTarget(m_cc);
|
DB.setDBTarget(m_cc);
|
||||||
if (m_cc.isServerObjects() == false)
|
|
||||||
|
//wan
|
||||||
|
if (m_cc.isRMIoverHTTP()) return;
|
||||||
|
|
||||||
|
//vpn or direct
|
||||||
|
if (m_cc.isServerObjects() == false
|
||||||
|
|| m_cc.isAppsServerOK(false) == false)
|
||||||
DB.connect();
|
DB.connect();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue