Automatic merge from release/2.0.0 -> release/2.1.0

* commit 'f5e86f1520b2781f61edcde2203054e78492bd72':
  修复因添加nil到errors导致野指针引用bug
This commit is contained in:
邱剑
2018-08-21 20:52:49 +08:00
+2 -2
View File
@@ -145,9 +145,9 @@ func (manager *SCloudregionManager) SyncRegions(ctx context.Context, userCred mc
_, err = removed[i].PerformDisable(ctx, userCred, nil, nil)
}
if err != nil {
syncResult.Delete()
} else {
syncResult.DeleteError(err)
} else {
syncResult.Delete()
}
}
}