| Index: client/html/src/Measurement.dart
|
| diff --git a/client/html/src/Measurement.dart b/client/html/src/Measurement.dart
|
| index dfcf40a2826194dc02d7afeee8b099cf04dd46fa..e92a46c82b7d82ebd44be89fded51e59a5e56b91 100644
|
| --- a/client/html/src/Measurement.dart
|
| +++ b/client/html/src/Measurement.dart
|
| @@ -86,12 +86,14 @@ void _completeMeasurementFutures() {
|
| // We must compute all new values before fulfilling the futures as
|
| // the onComplete callbacks for the futures could modify the DOM making
|
| // subsequent measurement calculations expensive to compute.
|
| - for (_MeasurementRequest request in _pendingRequests) {
|
| - try {
|
| - request.value = request.computeValue();
|
| - } catch(var e) {
|
| - request.value = e;
|
| - request.exception = true;
|
| + if (_pendingRequests !== null) {
|
| + for (_MeasurementRequest request in _pendingRequests) {
|
| + try {
|
| + request.value = request.computeValue();
|
| + } catch(var e) {
|
| + request.value = e;
|
| + request.exception = true;
|
| + }
|
| }
|
| }
|
|
|
| @@ -99,11 +101,13 @@ void _completeMeasurementFutures() {
|
| final readyMeasurementFrameCallbacks = _pendingMeasurementFrameCallbacks;
|
| _pendingRequests = null;
|
| _pendingMeasurementFrameCallbacks = null;
|
| - for (_MeasurementRequest request in completedRequests) {
|
| - if (request.exception) {
|
| - request.completer.completeException(request.value);
|
| - } else {
|
| - request.completer.complete(request.value);
|
| + if (completedRequests !== null) {
|
| + for (_MeasurementRequest request in completedRequests) {
|
| + if (request.exception) {
|
| + request.completer.completeException(request.value);
|
| + } else {
|
| + request.completer.complete(request.value);
|
| + }
|
| }
|
| }
|
|
|
|
|