Merge pull request #12417 from hashneo/patch-1

What if authConfig or factory is Nill?
This commit is contained in:
Jessie Frazelle 2015-04-23 13:54:47 -07:00
commit 54aab2e9b8

View file

@ -54,7 +54,7 @@ func NewSession(authConfig *cliconfig.AuthConfig, factory *requestdecorator.Requ
if err != nil { if err != nil {
return nil, err return nil, err
} }
if info.Standalone { if info.Standalone && authConfig != nil && factory != nil {
logrus.Debugf("Endpoint %s is eligible for private registry. Enabling decorator.", r.indexEndpoint.String()) logrus.Debugf("Endpoint %s is eligible for private registry. Enabling decorator.", r.indexEndpoint.String())
dec := requestdecorator.NewAuthDecorator(authConfig.Username, authConfig.Password) dec := requestdecorator.NewAuthDecorator(authConfig.Username, authConfig.Password)
factory.AddDecorator(dec) factory.AddDecorator(dec)