Merge pull request #887 from MihaelaStoica/CA-187132

CA-187132: XenCenter loses XenServer address when retrying connection
This commit is contained in:
Gabor Apati-Nagy 2016-03-09 11:14:23 +00:00
commit 1acf4bf261

View File

@ -1532,7 +1532,7 @@ namespace XenAdmin.Network
} }
MaybeStartNextSlaveTimer(reason, error); MaybeStartNextSlaveTimer(reason, error);
} }
else else if (LastMasterHostname != "")
{ {
log.DebugFormat("Stopping search for new master for {0}: timeout reached without success. Trying the old master one last time", log.DebugFormat("Stopping search for new master for {0}: timeout reached without success. Trying the old master one last time",
LastConnectionFullName); LastConnectionFullName);
@ -1540,6 +1540,10 @@ namespace XenAdmin.Network
Hostname = LastMasterHostname; Hostname = LastMasterHostname;
ReconnectMaster(); ReconnectMaster();
} }
else
{
OnConnectionResult(false, reason, error);
}
} }
} }
else else