Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Protect service restoration against SentinelException #6451

Merged
merged 4 commits into from
Sep 25, 2023
Merged

Protect service restoration against SentinelException #6451

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7be47dc
Protect the hot restart restore
CoderDake Sep 22, 2023
84a8078
release notes
CoderDake Sep 22, 2023
9824b84
Update packages/devtools_app_shared/lib/src/service/service_extension…
CoderDake Sep 25, 2023
dfc8919
Merge remote-tracking branch 'upstream/master' into platformOverride
CoderDake Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/devtools_app/release_notes/NEXT_RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ DevTools extension for your pub package, see the getting started guide for
* Fixed theming bug in isolate selector - [#6403](https://github.com/flutter/devtools/pull/6403)
* Show the hot reload button for Dart server apps that support hot reload -
[#6341](https://github.com/flutter/devtools/pull/6341)
* Fixed exceptions on hot restart - [#6451](https://github.com/flutter/devtools/pull/6451)

## Inspector updates

Expand Down
13 changes: 9 additions & 4 deletions packages/devtools_app_shared/lib/src/service/service_extension_manager.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,10 +249,15 @@ final class ServiceExtensionManager with DisposerMixin {
// extension. This will restore extension states on the device after a hot
// restart. [_enabledServiceExtensions] will be empty on page refresh or
// initial start.
return await _callServiceExtension(
name,
_enabledServiceExtensions[name]!.value,
);
try {
return await _callServiceExtension(
name,
_enabledServiceExtensions[name]!.value,
);
} on SentinelException catch (_) {
// Service extension stopped existing while calling, so do nothing.
// This typically happens during hot restarts.
}
} else {
// Set any extensions that are already enabled on the device. This will
// enable extension states in DevTools on page refresh or initial start.
Expand Down