commit 8d12b50cfb20eaef50e0998abe8d458866896003
author Martijn Coenen <maco@google.com> Tue Dec 27 14:30:27 2016 +0100
committer Martijn Coenen <maco@google.com> Wed Dec 28 23:47:58 2016 +0100
tree 8a10000e7c4d926961337cc16da7193f8e42267d
parent c6752dcea3b5dae1e99960b5beb6af394280b393

Support (un)linkToDeath in Java.

Test: mma, hidl_test_java
Bug: 31632518
Change-Id: Ic324deb5b0b17340328a08e736e07b47a7bea59b

Method.cpp

diff --git a/Method.cpp b/Method.cpp
index a085497..e41ebd0 100644
--- a/Method.cpp
+++ b/Method.cpp
@@ -75,7 +75,9 @@
     CHECK(mIsHidlReserved);
     auto it = mCppImpl.find(type);
     if (it != mCppImpl.end()) {
-        it->second(out);
+        if (it->second != nullptr) {
+            it->second(out);
+        }
     }
 }
 
@@ -83,7 +85,9 @@
     CHECK(mIsHidlReserved);
     auto it = mJavaImpl.find(type);
     if (it != mJavaImpl.end()) {
-        it->second(out);
+        if (it->second != nullptr) {
+            it->second(out);
+        }
     }
 }