Repository: cloudstack Updated Branches: refs/heads/master d51e8f44a -> e07d0ddab
fixed CLOUDSTACK-6261: remove the forceful timeout setting when login to NetScaler. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e07d0dda Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e07d0dda Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e07d0dda Branch: refs/heads/master Commit: e07d0ddabfedad137856c3c9ae7de3a96fe25feb Parents: d51e8f4 Author: Sujaya Maiyya <sujaya.mai...@citrix.com> Authored: Tue Jul 8 14:42:39 2014 +0530 Committer: Rajesh Battala <rajesh.batt...@citrix.com> Committed: Wed Jul 9 22:08:14 2014 +0530 ---------------------------------------------------------------------- .../src/com/cloud/network/resource/NetscalerResource.java | 3 --- 1 file changed, 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e07d0dda/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java ---------------------------------------------------------------------- diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java index ff51ef9..8757699 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/resource/NetscalerResource.java @@ -171,7 +171,6 @@ public class NetscalerResource implements ServerResource { // interface to interact with service VM of the SDX appliance com.citrix.sdx.nitro.service.nitro_service _netscalerSdxService; - Long _timeout = new Long(100000); base_response apiCallResult; public NetscalerResource() { @@ -294,7 +293,6 @@ public class NetscalerResource implements ServerResource { if (!_isSdx) { _netscalerService = new nitro_service(_ip, "https"); _netscalerService.set_credential(_username, _password); - _netscalerService.set_timeout(_timeout); _netscalerService.set_certvalidation(false); _netscalerService.set_hostnameverification(false); apiCallResult = _netscalerService.login(); @@ -984,7 +982,6 @@ public class NetscalerResource implements ServerResource { try { nitro_service _netscalerService = new nitro_service(cmd.getLoadBalancerIP(), "https"); _netscalerService.set_credential(username, password); - _netscalerService.set_timeout(_timeout); apiCallResult = _netscalerService.login(); if (apiCallResult.errorcode == 0) { nsServiceUp = true;
