Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changes/ensure-disposal-completion
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
patch type="fixed" "Ensure all dispose functions are executed even if one throws"
6 changes: 5 additions & 1 deletion lib/src/support/disposable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ mixin _Disposer {
logger.finer('[$objectId] running ${_disposeFuncs.length} dispose funcs...');
// call dispose funcs in reverse order
for (final disposeFunc in _disposeFuncs.reversed) {
await disposeFunc();
try {
await disposeFunc();
} catch (e, stack) {
logger.warning('[$objectId] error during dispose: $e', e, stack);
}
}
_disposeFuncs.clear();
logger.finer('[$objectId] dispose complete.');
Expand Down
45 changes: 45 additions & 0 deletions test/support/disposable_test.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import 'package:flutter_test/flutter_test.dart';

import 'package:livekit_client/src/support/disposable.dart';

class TestDisposable extends Disposable {
@override
Future<bool> dispose() async {
return await super.dispose();
}
}

void main() {
group('Disposable', () {
test('should execute all dispose functions even if one fails', () async {
final disposable = TestDisposable();
bool func1Called = false;
bool func2Called = false;
bool func3Called = false;

// Dispose functions are called in reverse order of addition

// Added 1st -> Called 3rd
disposable.onDispose(() async {
func1Called = true;
});

// Added 2nd -> Called 2nd
disposable.onDispose(() async {
func2Called = true;
throw Exception('fail');
});

// Added 3rd -> Called 1st
disposable.onDispose(() async {
func3Called = true;
});

await disposable.dispose();

expect(func3Called, isTrue, reason: 'Last added (func3) should be called first');
expect(func2Called, isTrue, reason: 'Middle added (func2) should be called');
expect(func1Called, isTrue, reason: 'First added (func1) should be called even if func2 failed');
});
});
}