mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java - Issue 694463002: Revert of Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444

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: mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java

Issue 694463002: Revert of Update mojo sdk to rev e083961bf11fd0c94d40be8853761da529b6d444 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 | « mojo/public/java/bindings/src/org/chromium/mojo/bindings/BindingsHelper.java ('k') | mojo/public/js/bindings/core_unittests.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java

diff --git a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java

index dcaf86c74c497c39a847b71d1ea39fe036030f49..ad4e10805bb40401dd491bffc80fc343c1a65cb0 100644

--- a/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java

+++ b/mojo/public/java/bindings/src/org/chromium/mojo/bindings/MessageHeader.java

@@ -190,10 +190,19 @@

return false;

MessageHeader other = (MessageHeader) object;

- return (BindingsHelper.equals(mDataHeader, other.mDataHeader)

- && mFlags == other.mFlags

- && mRequestId == other.mRequestId

- && mType == other.mType);

+ if (mDataHeader == null) {

+ if (other.mDataHeader != null) {

+ return false;

+ }

+ } else {

+ if (!mDataHeader.equals(other.mDataHeader)) {

+ return false;

+ }

+ return (mFlags == other.mFlags &&

+ mRequestId == other.mRequestId &&

+ mType == other.mType);

}

/**