Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
F
Front-End
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
abdullh.alsoleman
Front-End
Commits
fc59f01e
Unverified
Commit
fc59f01e
authored
Jan 16, 2021
by
Jonah Williams
Committed by
GitHub
Jan 16, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[flutter_tools] ensure allowExistingDdsInstance param is always non-null (#74091)
parent
e7aced17
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
resident_runner.dart
packages/flutter_tools/lib/src/resident_runner.dart
+2
-2
run_cold.dart
packages/flutter_tools/lib/src/run_cold.dart
+3
-1
resident_runner_test.dart
...lutter_tools/test/general.shard/resident_runner_test.dart
+2
-1
No files found.
packages/flutter_tools/lib/src/resident_runner.dart
View file @
fc59f01e
...
@@ -222,7 +222,7 @@ class FlutterDevice {
...
@@ -222,7 +222,7 @@ class FlutterDevice {
int
ddsPort
,
int
ddsPort
,
bool
disableServiceAuthCodes
=
false
,
bool
disableServiceAuthCodes
=
false
,
bool
disableDds
=
false
,
bool
disableDds
=
false
,
bool
allowExistingDdsInstance
=
fals
e
,
@required
bool
allowExistingDdsInstanc
e
,
bool
ipv6
=
false
,
bool
ipv6
=
false
,
})
{
})
{
final
Completer
<
void
>
completer
=
Completer
<
void
>();
final
Completer
<
void
>
completer
=
Completer
<
void
>();
...
@@ -1217,7 +1217,7 @@ abstract class ResidentRunner {
...
@@ -1217,7 +1217,7 @@ abstract class ResidentRunner {
Restart
restart
,
Restart
restart
,
CompileExpression
compileExpression
,
CompileExpression
compileExpression
,
GetSkSLMethod
getSkSLMethod
,
GetSkSLMethod
getSkSLMethod
,
bool
allowExistingDdsInstance
,
@required
bool
allowExistingDdsInstance
,
})
async
{
})
async
{
if
(!
debuggingOptions
.
debuggingEnabled
)
{
if
(!
debuggingOptions
.
debuggingEnabled
)
{
throw
'The service protocol is not enabled.'
;
throw
'The service protocol is not enabled.'
;
...
...
packages/flutter_tools/lib/src/run_cold.dart
View file @
fc59f01e
...
@@ -73,7 +73,9 @@ class ColdRunner extends ResidentRunner {
...
@@ -73,7 +73,9 @@ class ColdRunner extends ResidentRunner {
if
(
debuggingOptions
.
debuggingEnabled
)
{
if
(
debuggingOptions
.
debuggingEnabled
)
{
try
{
try
{
await
Future
.
wait
(<
Future
<
void
>>[
await
Future
.
wait
(<
Future
<
void
>>[
connectToServiceProtocol
(),
connectToServiceProtocol
(
allowExistingDdsInstance:
false
,
),
serveDevToolsGracefully
(
serveDevToolsGracefully
(
devToolsServerAddress:
debuggingOptions
.
devToolsServerAddress
,
devToolsServerAddress:
debuggingOptions
.
devToolsServerAddress
,
),
),
...
...
packages/flutter_tools/test/general.shard/resident_runner_test.dart
View file @
fc59f01e
...
@@ -197,6 +197,7 @@ void main() {
...
@@ -197,6 +197,7 @@ void main() {
restart:
anyNamed
(
'restart'
),
restart:
anyNamed
(
'restart'
),
compileExpression:
anyNamed
(
'compileExpression'
),
compileExpression:
anyNamed
(
'compileExpression'
),
getSkSLMethod:
anyNamed
(
'getSkSLMethod'
),
getSkSLMethod:
anyNamed
(
'getSkSLMethod'
),
allowExistingDdsInstance:
anyNamed
(
'allowExistingDdsInstance'
),
)).
thenAnswer
((
Invocation
invocation
)
async
{
});
)).
thenAnswer
((
Invocation
invocation
)
async
{
});
when
(
mockFlutterDevice
.
setupDevFS
(
any
,
any
))
when
(
mockFlutterDevice
.
setupDevFS
(
any
,
any
))
.
thenAnswer
((
Invocation
invocation
)
async
{
.
thenAnswer
((
Invocation
invocation
)
async
{
...
@@ -2815,7 +2816,7 @@ void main() {
...
@@ -2815,7 +2816,7 @@ void main() {
observatoryUris:
Stream
<
Uri
>.
value
(
testUri
),
observatoryUris:
Stream
<
Uri
>.
value
(
testUri
),
);
);
await
flutterDevice
.
connect
();
await
flutterDevice
.
connect
(
allowExistingDdsInstance:
true
);
verify
(
mockLogReader
.
connectedVMService
=
mockVMService
);
verify
(
mockLogReader
.
connectedVMService
=
mockVMService
);
},
overrides:
<
Type
,
Generator
>{
},
overrides:
<
Type
,
Generator
>{
VMServiceConnector:
()
=>
(
Uri
httpUri
,
{
VMServiceConnector:
()
=>
(
Uri
httpUri
,
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment