Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #36169 #39750

Merged
merged 2 commits into from Jan 12, 2017
Merged

Automated cherry pick of #36169 #39750

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e57dea8
Bad conditional in vSphereLogin function
Nov 3, 2016
fc1d0bb
Applying changes per PR feedback -
Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions pkg/cloudprovider/providers/vsphere/vsphere.go
View file
Open in desktop
Expand Up @@ -360,8 +360,11 @@ func vSphereLogin(vs *VSphere, ctx context.Context) error {
m := session.NewManager(vs.client.Client)
// retrieve client's current session
u, err := m.UserSession(ctx)
if err == nil && u == nil {
// current session is valid
if err != nil {
glog.Errorf("Error while obtaining user session. err: %q", err)
return err
}
if u != nil {
return nil
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should not it be if u == nil {return nil} ?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can refer to the original PR for relevant discussion as well as looking at the API usage.
We should clean up this code but that should not be part of a cherry pick.

}

Expand Down