Automatic merge from release/2.1.0 -> release/2.2.0

* commit 'f15f944e04d7212d6723e0f03a26285dcc2dd313':
  避免storagecachedimage数据库操作时panic
This commit is contained in:
邱剑
2018-09-12 15:34:32 +08:00
+1 -1
View File
@@ -292,7 +292,7 @@ func (self *SCachedimage) ChooseSourceStoragecacheInRange(hostType string, exclu
q = q.Filter(sqlchemy.Equals(host.Field("manager_id"), obj.Id))
}
}
err := q.All(&scimgs)
err := db.FetchModelObjects(StoragecachedimageManager, q, &scimgs)
if err != nil {
return nil, err
}