/hg/icedtea: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 408e1b8501d1 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=408e1b8501d1
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 03 12:29:29 2010 +0100

	Synchronise plugin with version on the 1.7 branch.

	2010-06-03 Andrew John Hughes <ahughes at redhat.com>

	 * plugin/icedteanp/IcedTeaPluginRequestProcessor.cc,
		* plugin/icedteanp/IcedTeaPluginUtils.cc,
		* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
	Synchronise with version on IcedTea6 1.7 branch.


changeset c19577b915ad in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=c19577b915ad
author: Andrew John Hughes <ahughes at redhat.com>
date: Thu Jun 03 12:31:47 2010 +0100

	Add missing escapes in clean-rt to join if statement together.

	2010-06-03 Andrew John Hughes <ahughes at redhat.com>

	 * Makefile.am: (clean-rt): Add missing escapes to
	join lines of if statement.


diffstat:

5 files changed, 29 insertions(+), 4 deletions(-)
ChangeLog                                                |   13 +++++++++++++
Makefile.am                                              |    4 ++--
plugin/icedteanp/IcedTeaPluginRequestProcessor.cc        |   11 +++++++++++
plugin/icedteanp/IcedTeaPluginUtils.cc                   |    2 --
plugin/icedteanp/java/sun/applet/PluginAppletViewer.java |    3 +++

diffs (87 lines):

diff -r 8d5863423d1b -r c19577b915ad ChangeLog
--- a/ChangeLog	Thu Jun 03 11:50:51 2010 +0100
+++ b/ChangeLog	Thu Jun 03 12:31:47 2010 +0100
@@ -1,3 +1,16 @@ 2010-06-03  Andrew John Hughes  <ahughes
+2010-06-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	(clean-rt): Add missing escapes to join lines
+	of if statement.
+
+2010-06-03  Andrew John Hughes  <ahughes at redhat.com>
+
+	* plugin/icedteanp/IcedTeaPluginRequestProcessor.cc,
+	* plugin/icedteanp/IcedTeaPluginUtils.cc,
+	* plugin/icedteanp/java/sun/applet/PluginAppletViewer.java:
+	Synchronise with version on IcedTea6 1.7 branch.
+
 2010-06-03  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 8d5863423d1b -r c19577b915ad Makefile.am
--- a/Makefile.am	Thu Jun 03 11:50:51 2010 +0100
+++ b/Makefile.am	Thu Jun 03 12:31:47 2010 +0100
@@ -2643,8 +2643,8 @@ clean-rt:
 	rm -rf lib/rt
 	rm -f stamps/rt-class-files.stamp stamps/rt.stamp
 	rm -f rt-source-files.txt
-	if [ -e bootstrap/boot/jre/lib ] ; then
-	  cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar bootstrap/boot/jre/lib
+	if [ -e bootstrap/boot/jre/lib ] ; then \
+	  cp $(SYSTEM_JDK_DIR)/jre/lib/rt.jar bootstrap/boot/jre/lib ; \
 	fi
 
 # Target Aliases
diff -r 8d5863423d1b -r c19577b915ad plugin/icedteanp/IcedTeaPluginRequestProcessor.cc
--- a/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Thu Jun 03 11:50:51 2010 +0100
+++ b/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc	Thu Jun 03 12:31:47 2010 +0100
@@ -463,6 +463,15 @@ PluginRequestProcessor::setMember(std::v
     } else
     {
         java_result = java_request.getString(propertyNameID);
+
+        // the result we want is in result_string (assuming there was no error)
+        if (java_result->error_occurred)
+        {
+            printf("Unable to get member name for setMember. Error occurred: %s\n", java_result->error_msg);
+            //goto cleanup;
+        }
+
+        property_identifier = browser_functions.getstringidentifier(java_result->return_string->c_str());
     }
 
     AsyncCallThreadData thread_data = AsyncCallThreadData();
@@ -938,6 +947,8 @@ _call(void* data)
     ((AsyncCallThreadData*) data)->call_successful =
       browser_functions.invoke(instance, window_ptr, function, args, *arg_count, call_result);
 
+    IcedTeaPluginUtilities::printNPVariant(*call_result);
+
     if (((AsyncCallThreadData*) data)->call_successful)
     {
         IcedTeaPluginUtilities::JSIDToString(call_result, &call_result_ptr_str);
diff -r 8d5863423d1b -r c19577b915ad plugin/icedteanp/IcedTeaPluginUtils.cc
--- a/plugin/icedteanp/IcedTeaPluginUtils.cc	Thu Jun 03 11:50:51 2010 +0100
+++ b/plugin/icedteanp/IcedTeaPluginUtils.cc	Thu Jun 03 12:31:47 2010 +0100
@@ -777,8 +777,6 @@ IcedTeaPluginUtilities::javaResultToNPVa
             PLUGIN_DEBUG_1ARG("Method call returned a string: \"%s\"\n", return_str);
             STRINGZ_TO_NPVARIANT(return_str, *variant);
 
-            // delete string from java side, as it is no longer needed
-            java_request.deleteReference(return_obj_instance_id);
         } else {
 
             // Else this is a regular class. Reference the class object so
diff -r 8d5863423d1b -r c19577b915ad plugin/icedteanp/java/sun/applet/PluginAppletViewer.java
--- a/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Jun 03 11:50:51 2010 +0100
+++ b/plugin/icedteanp/java/sun/applet/PluginAppletViewer.java	Thu Jun 03 12:31:47 2010 +0100
@@ -556,6 +556,9 @@ import com.sun.jndi.toolkit.url.UrlUtil;
                      request.documentbase =
                          UrlUtil.decode(message.substring("tag".length() + 1, index));
                      request.tag = message.substring(index + 1);
+                     PluginDebug.debug ("REQUEST TAG: " + request.tag + " " +
+                             Thread.currentThread());
+
                          PluginDebug.debug ("REQUEST TAG, PARSING " +
                                  Thread.currentThread());
                          PluginAppletViewer.parse