From 98660c0eb63b3a939c6048c1d8794ec17fd00660 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Thu, 27 Mar 2014 17:20:43 -0700 Subject: [PATCH] BigSwitch: Move attr ref after error check Change in Big Switch server manager module: Moves an attribute reference to a line after the error check that validates the object is not None. Closes-Bug: #1298699 Change-Id: I5f9abf3b456d5066e90c05bc6b3aa5adcecb7943 --- neutron/plugins/bigswitch/servermanager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py index 0a3cb19129..8792290af6 100644 --- a/neutron/plugins/bigswitch/servermanager.py +++ b/neutron/plugins/bigswitch/servermanager.py @@ -162,11 +162,11 @@ class ServerProxy(object): if self.ssl: self.currentconn = HTTPSConnectionWithValidation( self.server, self.port, timeout=timeout) - self.currentconn.combined_cert = self.combined_cert if self.currentconn is None: LOG.error(_('ServerProxy: Could not establish HTTPS ' 'connection')) return 0, None, None, None + self.currentconn.combined_cert = self.combined_cert else: self.currentconn = httplib.HTTPConnection( self.server, self.port, timeout=timeout)