SPARK-1695 Crash in lookup_strategy_async

This commit is contained in:
John Colvin committed 2018-09-05 16:54:57 -04:00
1 parent 46387703fe
commit 7877e44713
3 files changed
+13 -12

No files matched your search

@@ -1,4 +1,5 @@
using bts.api;
using bts.spark;
using mbts;
using mbts.spark;
using mbts.ui;
@@ -31,9 +32,9 @@ namespace bts {
} else if (orders.state.Values.Any(o => o.Def.SecurityKey == id && o.is_non_terminal())) {
Log.Ui.warn($"Ignoring request to delete synthetic security ({id}) because non-terminal-orders were detected.");
} else {
var (strategy, strategy_success) = await _orders_model.spreader.lookup_strategy_async(id);
if (strategy_success) {
var deleted_strategy = strategy.with(deleted: true);
ExecutionStrategyImmutable? strategy = await _orders_model.spreader.lookup_strategy_async(id);
if (strategy.HasValue) {
ExecutionStrategyImmutable deleted_strategy = strategy.Value.with(deleted: true);
await _orders_model.spreader.save_strategy(id, deleted_strategy);
}
}
@@ -67,9 +67,9 @@ namespace bts.shell {
}
async Task _show_synthetic_strategy_async(SecurityImmutable verified_synthetic) {
var lookup = await _model.spreader.lookup_strategy_async(verified_synthetic);
if (lookup.success)
_show_synthetic_editor(new SyntheticEditorVM(_model.spreader, verified_synthetic, lookup.result, _model.security_has_working_orders(verified_synthetic.Id)));
ExecutionStrategyImmutable? strategy = await _model.spreader.lookup_strategy_async(verified_synthetic);
if (strategy.HasValue)
_show_synthetic_editor(new SyntheticEditorVM(_model.spreader, verified_synthetic, strategy.Value, _model.security_has_working_orders(verified_synthetic.Id)));
}
void _show_synthetic_clone((SecurityImmutable security, ExecutionStrategyImmutable strategy) args) {
@@ -39,18 +39,18 @@ namespace mbts.spark {
return (result, success);
});
public async Task<(ExecutionStrategyImmutable result, bool success)> lookup_strategy_async(SecurityImmutable security) =>
public async Task<ExecutionStrategyImmutable?> lookup_strategy_async(SecurityImmutable security) =>
await lookup_strategy_async(security.Id);
public async Task<(ExecutionStrategyImmutable result, bool success)> lookup_strategy_async(uint id) {
public async Task<ExecutionStrategyImmutable?> lookup_strategy_async(uint id) {
var result = await _service.query_security_metadata_async(new MetadataQuery { SecurityKey = { id } });
if (result.success) {
var v = result.value.Data.FirstOrDefault(i => i.SecurityKey == id);
if (v != null) {
return (v.Strategy, true);
var metadata = result.value.Data.FirstOrDefault(i => i.SecurityKey == id);
if (metadata != null) {
return metadata.Strategy;
}
}
return (null, false);
return null;
}
public async Task<uint?> create_synthetic(SecurityImmutable synthetic) {