/hg/release/icedtea-web-1.1: Use correct response parameter when...

[dbhole at icedtea.classpath.org]

changeset 9f7d46c3314d in /hg/release/icedtea-web-1.1
details: http://icedtea.classpath.org/hg/release/icedtea-web-1.1?cmd=changeset;node=9f7d46c3314d
author: Deepak Bhole <dbhole at redhat.com>
date: Thu Dec 22 16:15:54 2011 -0500

	Use correct response parameter when returning array member vs member
	itself

	Patch from Thomas Meyer <thomas at m3y3r.de>


diffstat:

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

diffs (30 lines):

diff -r cdd0bbf399e8 -r 9f7d46c3314d ChangeLog
--- a/ChangeLog	Wed Dec 21 17:29:45 2011 -0500
+++ b/ChangeLog	Thu Dec 22 16:15:54 2011 -0500
@@ -1,3 +1,8 @@
+2011-12-22  Thomas Meyer <thomas at m3y3r.de>
+
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc(sendMember): Use
+	correct response parameter when returning array member vs member itself.
+
 2011-12-21  Thomas Meyer <thomas at m3y3r.de>
 
 	RH586194: Unable to connect to connect with Juniper VPN client
diff -r cdd0bbf399e8 -r 9f7d46c3314d plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Wed Dec 21 17:29:45 2011 -0500
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Thu Dec 22 16:15:54 2011 -0500
@@ -556,11 +556,11 @@
     createJavaObjectFromVariant(instance, *member_ptr, &result_id);
 
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
-    if (*(message_parts->at(2)) == "GetSlot")
+    if (*(message_parts->at(4)) == "GetSlot")
     {
+        response.append(" JavaScriptGetSlot ");
+    } else {
         response.append(" JavaScriptGetMember ");
-    } else {
-        response.append(" JavaScriptGetSlot ");
     }
     response.append(result_id.c_str());
     plugin_to_java_bus->post(response.c_str());