openstack/neutron
Code Issues Proposed changes

Merge "BigSwitch: Move attr ref after error check"

Browse Source
This commit is contained in:
Jenkins 2014-03-28 11:07:06 +00:00 committed by Gerrit Code Review
commit 8d38476535
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/bigswitch/servermanager.py
View File

@ -162,11 +162,11 @@ class ServerProxy(object):
if self.ssl: if self.ssl:
self.currentconn = HTTPSConnectionWithValidation( self.currentconn = HTTPSConnectionWithValidation(
self.server, self.port, timeout=timeout) self.server, self.port, timeout=timeout)
self.currentconn.combined_cert = self.combined_cert
if self.currentconn is None: if self.currentconn is None:
LOG.error(_('ServerProxy: Could not establish HTTPS ' LOG.error(_('ServerProxy: Could not establish HTTPS '
'connection')) 'connection'))
return 0, None, None, None return 0, None, None, None
self.currentconn.combined_cert = self.combined_cert
else: else:
self.currentconn = httplib.HTTPConnection( self.currentconn = httplib.HTTPConnection(
self.server, self.port, timeout=timeout) self.server, self.port, timeout=timeout)