Automatic merge from release/2.0.0 -> release/2.1.0

* commit '934842b7abb7aaae2f93c1188335bf4068844f6f':
  修复未初始化guestmanager bug
This commit is contained in:
邱剑
2018-08-25 13:58:41 +08:00
+2 -3
View File
@@ -832,9 +832,8 @@ func (self *SDisk) GetAttachedGuests() []SGuest {
q = q.Filter(sqlchemy.Equals(guestdisks.Field("disk_id"), self.Id))
ret := make([]SGuest, 0)
err := q.All(&ret)
if err != nil {
log.Errorf("%s", err)
if err := db.FetchModelObjects(GuestManager, q, &ret); err != nil {
log.Errorf("Fetch Geusts Objects %v", err)
return nil
}
return ret