Mercurial > hg > release > icedtea-web-1.2
changeset 335:d3b97728550a
Return 0 id to Java side if call/eval fail.
| author | Deepak Bhole <dbhole@redhat.com> |
|---|---|
| date | Tue, 28 Feb 2012 10:05:57 -0500 |
| parents | 07717ba83e5f |
| children | e21f13506c3c |
| files | ChangeLog plugin/icedteanp/IcedTeaPluginRequestProcessor.cc |
| diffstat | 2 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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");