android_webview/java/src/org/chromium/android_webview/PostMessageSender.java - Issue 986553004: Hold messages in message port service when a message port is

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: android_webview/java/src/org/chromium/android_webview/PostMessageSender.java

Issue 986553004: Hold messages in message port service when a message port is (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address hush nit Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/MessagePort.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/java/src/org/chromium/android_webview/PostMessageSender.java

diff --git a/android_webview/java/src/org/chromium/android_webview/PostMessageSender.java b/android_webview/java/src/org/chromium/android_webview/PostMessageSender.java

index 01d7caed64e6e1e7c606cb5bd121370f32cf9635..318eaba94b4d2c4f140aadf97885c211bd9d1b10 100644

--- a/android_webview/java/src/org/chromium/android_webview/PostMessageSender.java

+++ b/android_webview/java/src/org/chromium/android_webview/PostMessageSender.java

@@ -122,8 +122,14 @@ public class PostMessageSender implements AwMessagePortService.MessageChannelObs

// Sanity check all the ports that are being transferred.

if (sentPorts != null) {

for (MessagePort p : sentPorts) {

- if (p.isClosed() || p.isTransferred()) {

- throw new IllegalStateException("Port cannot be transferred");

+ if (p.isClosed()) {

+ throw new IllegalStateException("Closed port cannot be transfered");

+ }

+ if (p.isTransferred()) {

+ throw new IllegalStateException("Port cannot be re-transferred");

+ }

+ if (p.isStarted()) {

+ throw new IllegalStateException("Started port cannot be transferred");

}

p.setTransferred();

}