Return 0 id to Java side if call/eval fail.

2 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index ffaa722..876c4db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-28  Deepak Bhole <[email protected]>
+
+	* 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  <[email protected]>
 
 	* acinclude.m4 (IT_CHECK_PLUGIN_DEPENDENCIES): Use the mozilla-plugin
diff --git a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
index 6a3b9fd..df8128d 100644
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
@@ -862,8 +862,12 @@ _eval(void* data)
         {
             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(void* data)
         {
         	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");