commit bb5a8fd908a53e5d0fdaf84548d3b835b2ccc426
author Manuel Roman <manuelroman@google.com> Wed May 23 16:00:37 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed May 23 16:00:37 2012 -0700
tree 9269c7f21af63f58bb50f1e8ac69c90eac86f3a0
parent 27637173bb815b4cf8684474595d32604753ccba
parent 9d98a089756b692eefeae7f92cca15e121196e0c

am 9d98a089: Check result handler is not null

* commit '9d98a089756b692eefeae7f92cca15e121196e0c':
  Check result handler is not null

tools/aidl/generate_java_rpc.cpp

diff --git a/tools/aidl/generate_java_rpc.cpp b/tools/aidl/generate_java_rpc.cpp
index e5fa076..5e4dacc 100644
--- a/tools/aidl/generate_java_rpc.cpp
+++ b/tools/aidl/generate_java_rpc.cpp
@@ -786,7 +786,10 @@
     }
 
     // Call the callback method
-    dispatchMethod->statements->Add(realCall);
+    IfStatement* ifst = new IfStatement;
+        ifst->expression = new Comparison(new FieldVariable(THIS_VALUE, "callback"), "!=", NULL_VALUE);
+    dispatchMethod->statements->Add(ifst);
+    ifst->statements->Add(realCall);
 }
 
 static void