[PATCH] getMember: Fix returned object type - v2

[Thomas Meyer]

Use createJavaObjectFromVariant() on NPVariant returned by
NPN_GetProperty() to
create the Java object. This should create the correct object return type.
See also bug report: https://bugzilla.redhat.com/show_bug.cgi?id=586194

Signed-off-by: Thomas Meyer <thomas at m3y3r.de>
---

Fixed formating and make source compile.

diff -r df87375f72cd -r 3674bf4ef962 plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Mon Dec 05 13:15:32 2011 -0500
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Fri Dec 09 19:05:30 2011 +0100
@@ -477,7 +477,7 @@
  * This is a static function, called in another thread. Since certain data
  * can only be requested from the main thread in Mozilla, this function
  * does whatever it can seperately, and then makes an internal request that
- * causes _sendMember to do the rest of the work.
+ * causes _getMember to do the rest of the work.
  *
  * @param message_parts The request message
  */
@@ -490,12 +490,12 @@
     JavaRequestProcessor java_request = JavaRequestProcessor();
     JavaResultData* java_result;
     NPVariant* parent_ptr;
+    NPVariant* member_ptr;
 
     //int reference;
     std::string member_id = std::string();
-    std::string jsObjectClassID = std::string();
-    std::string jsObjectConstructorID = std::string();
     std::string response = std::string();
+    std::string result_id = std::string();
 
     NPIdentifier member_identifier;
 
@@ -551,50 +551,9 @@
 
     PLUGIN_DEBUG("Member PTR after internal request: %s\n", thread_data.result.c_str());
 
-    java_result = java_request.findClass(0, "netscape.javascript.JSObject");
+    member_ptr = (NPVariant*) IcedTeaPluginUtilities::stringToJSID(thread_data.result);
 
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
-    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
-    }
-
-    jsObjectClassID.append(*(java_result->return_string));
-
-    args = std::vector<std::string>();
-    std::string longArg = "J";
-    args.push_back(longArg);
-
-    java_result = java_request.getMethodID(jsObjectClassID,
-                                           browser_functions.getstringidentifier("<init>"),
-                                           args);
-
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
-    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
-    }
-
-    jsObjectConstructorID.append(*(java_result->return_string));
-
-    // We have the method id. Now create a new object.
-
-    args.clear();
-    args.push_back(thread_data.result);
-    java_result = java_request.newObjectWithConstructor("",
-                                         jsObjectClassID,
-                                         jsObjectConstructorID,
-                                         args);
-
-    // the result we want is in result_string (assuming there was no error)
-    if (java_result->error_occurred)
-    {
-        printf("Unable to process getMember request. Error occurred: %s\n", java_result->error_msg->c_str());
-        //goto cleanup;
-    }
-
+    createJavaObjectFromVariant(instance, *member_ptr, &result_id);
 
     IcedTeaPluginUtilities::constructMessagePrefix(0, reference, &response);
     if (*(message_parts->at(2)) == "GetSlot")
@@ -603,7 +562,7 @@
     } else {
         response.append(" JavaScriptGetSlot ");
     }
-    response.append(java_result->return_string->c_str());
+    response.append(result_id.c_str());
     plugin_to_java_bus->post(response.c_str());
 }
 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 490 bytes
Desc: This is a digitally signed message part
Url : http://mail.openjdk.java.net/pipermail/distro-pkg-dev/attachments/20111209/49782899/attachment.bin