Merge pull request #910 in YUNIONIO/onecloud from ~QUXUAN/onecloud:hotfix/qx-fix-unmarshal-nil to release/2.5.0

* commit 'd3d7d395f3c1230a86c0e8eef3621ef243dfb08c':
  避免unmarshal nil
This commit is contained in:
邱剑
2019-01-09 17:29:55 +08:00
+1 -1
View File
@@ -319,7 +319,7 @@ func (acl *SLoadbalancerAcl) SyncWithCloudLoadbalancerAcl(ctx context.Context, u
if projectSync && len(projectId) > 0 {
acl.ProjectId = projectId
}
acl.AclEntries = &SLoadbalancerAclEntries{}
return aclEntries.Unmarshal(acl.AclEntries)
})
return err