/hg/release/icedtea-web-1.2: Return 0 id to Java side if call/ev...

[dbhole at icedtea.classpath.org]

changeset d3b97728550a in /hg/release/icedtea-web-1.2
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.2?cmd=changeset;node=d3b97728550a
author: Deepak Bhole <dbhole at redhat.com>
date: Tue Feb 28 10:05:57 2012 -0500

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


diffstat:

 ChangeLog                                         |   6 ++++++
 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc |  12 +++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diffs (45 lines):

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 at 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 at 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");