Merge pull request #10486 from tb365/automated-cherry-pick-of-#10483-upstream-release-3.7

Automated cherry pick of #10483: (fix) region: qcloud elb https listener create fix
This commit is contained in:
Zexi Li
2021-03-24 18:51:50 +08:00
committed by GitHub
+1 -6
View File
@@ -816,13 +816,8 @@ func (lblis *SLoadbalancerListener) GetLoadbalancerCertificate() (*SCachedLoadba
return nil, nil
}
region := lblis.GetRegion()
if region == nil {
return nil, errors.Wrap(httperrors.ErrInvalidStatus, "loadbalancer listener is not attached to any region")
}
ret := &SCachedLoadbalancerCertificate{}
err := CachedLoadbalancerCertificateManager.Query().Equals("id", lblis.CachedCertificateId).Equals("cloudregion_id", region.Id).IsFalse("pending_deleted").First(ret)
err := CachedLoadbalancerCertificateManager.Query().Equals("id", lblis.CachedCertificateId).IsFalse("pending_deleted").First(ret)
if err != nil {
if err == sql.ErrNoRows {
return nil, nil