Commit cb4889d4 authored by Tobias Sargeant's avatar Tobias Sargeant Committed by Commit Bot

[webview support lib] handle null isomporphic objects

Bug: 865062
Change-Id: I8efb1817b1b2bf390189ed117c8773b6a0329ded
Reviewed-on: https://chromium-review.googlesource.com/1244798Reviewed-by: default avatarNate Fischer <ntfschr@chromium.org>
Commit-Queue: Tobias Sargeant <tobiasjs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594142}
parent c88fd9b8
...@@ -18,6 +18,9 @@ abstract class IsomorphicAdapter implements IsomorphicObjectBoundaryInterface { ...@@ -18,6 +18,9 @@ abstract class IsomorphicAdapter implements IsomorphicObjectBoundaryInterface {
@Override @Override
public Object getOrCreatePeer(Callable<Object> creationCallable) throws Exception { public Object getOrCreatePeer(Callable<Object> creationCallable) throws Exception {
AwSupportLibIsomorphic peeredObject = getPeeredObject(); AwSupportLibIsomorphic peeredObject = getPeeredObject();
if (peeredObject == null) {
return null;
}
Object peer = peeredObject.getSupportLibObject(); Object peer = peeredObject.getSupportLibObject();
if (peer == null) { if (peer == null) {
peeredObject.setSupportLibObject(peer = creationCallable.call()); peeredObject.setSupportLibObject(peer = creationCallable.call());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment