firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Follow up to https://github.com/flutter/flutter/pull/23436 (#23876)

Browse Source
This commit is contained in:
Jonah Williams
2018-11-06 08:37:53 -08:00
committed by GitHub
parent cb3dee79c5
commit 9b66fea2ea
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/flutter_tools/lib/src/commands/attach.dart
View File

@@ -141,15 +141,19 @@ class AttachCommand extends FlutterCommand {
'Waiting for a connection from Flutter on ${device.name}...',
expectSlowOperation: true,
);
final int localPort = await device.findIsolatePort(module, localPorts);
if (localPort == null) {
try {
final int localPort = await device.findIsolatePort(module, localPorts);
if (localPort == null) {
throwToolExit('No active Observatory running module \'$module\' on ${device.name}');
}
observatoryUri = ipv6
? Uri.parse('http://[$ipv6Loopback]:$localPort/')
: Uri.parse('http://$ipv4Loopback:$localPort/');
status.stop();
} catch (_) {
status.cancel();
throwToolExit('No active Observatory running module \'$module\' on ${device.name}');
rethrow;
}
status.stop();
observatoryUri = ipv6
? Uri.parse('http://[$ipv6Loopback]:$localPort/')
: Uri.parse('http://$ipv4Loopback:$localPort/');
} else {
ProtocolDiscovery observatoryDiscovery;
try {