# HG changeset patch
# User Deepak Bhole <dbhole@redhat.com>
# Date 1330441557 18000
# Node ID d3b97728550a615433a79116f6ff006c1c60a60e
# Parent  07717ba83e5f82a55302885978a9ceece83ba526
Return 0 id to Java side if call/eval fail.

diff -r 07717ba83e5f -r d3b97728550a ChangeLog
--- a/ChangeLog	Mon Feb 27 22:04:05 2012 +0100
+++ b/ChangeLog	Tue Feb 28 10:05:57 2012 -0500
@@ -1,3 +1,9 @@
+2012-02-28  Deepak Bhole <dbhole@redhat.com>
+
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+	(_eval): Return 0 id to Java side if eval fails.
+	(_call): Return 0 id to Java side if call fails.
+
 2012-02-27  Matthias Klose  <doko@ubuntu.com>
 
 	* acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin
diff -r 07717ba83e5f -r d3b97728550a plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Mon Feb 27 22:04:05 2012 +0100
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Tue Feb 28 10:05:57 2012 -0500
@@ -862,8 +862,12 @@
         {
             eval_variant_str = "0";
         }
-        ((AsyncCallThreadData*) data)->result.append(eval_variant_str);
+    } else
+    {
+        eval_variant_str = "0";
     }
+
+    ((AsyncCallThreadData*) data)->result.append(eval_variant_str);
     ((AsyncCallThreadData*) data)->result_ready = true;
 
     PLUGIN_DEBUG("_eval returning\n");
@@ -914,10 +918,12 @@
         {
         	call_result_ptr_str = "0";
         }
-
-        ((AsyncCallThreadData*) data)->result.append(call_result_ptr_str);
+    } else
+    {
+        call_result_ptr_str = "0";
     }
 
+    ((AsyncCallThreadData*) data)->result.append(call_result_ptr_str);
     ((AsyncCallThreadData*) data)->result_ready = true;
 
     PLUGIN_DEBUG("_call returning\n");