From: Kevin Benton <blak111@gmail.com>
Date: Fri, 28 Mar 2014 00:20:43 +0000 (-0700)
Subject: BigSwitch: Move attr ref after error check
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=979ec03f0be170b7b83fb8c9b6d76c678d8fca66;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/plugins/bigswitch/servermanager.py b/neutron/plugins/bigswitch/servermanager.py
index 0a3cb1912..8792290af 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)