summaryrefslogtreecommitdiff
path: root/java/openjdk6/files
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-10-13 19:51:32 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-10-13 19:51:32 +0000
commit10c99f335ec713a9335786d08920bb3171be05fb (patch)
treea9e6b65ddbf2e7786e101401ba6e4122b3f02b9d /java/openjdk6/files
parent- Update to 1.76. (diff)
Update Web Start and Java plugin to IcedTea6 1.9.1.
Diffstat (limited to 'java/openjdk6/files')
-rw-r--r--java/openjdk6/files/icedtea.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/openjdk6/files/icedtea.patch b/java/openjdk6/files/icedtea.patch
index 2e8bad1691a0..f0eaeb68b908 100644
--- a/java/openjdk6/files/icedtea.patch
+++ b/java/openjdk6/files/icedtea.patch
@@ -18,8 +18,8 @@ fails with EPERM. This is a POSIX requirement.
- We must join threads via pthread_join(3) after calling pthread_cancel(3).
Otherwise, we may destroy mutex or condition variable in use.
---- icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-08-06 07:05:21.916103000 -0400
-+++ icedtea6-1.9/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-09-23 21:52:17.000000000 -0400
+--- icedtea6-1.9.1/plugin/icedteanp/IcedTeaNPPlugin.cc.orig 2010-10-04 17:26:45.636097000 -0400
++++ icedtea6-1.9.1/plugin/icedteanp/IcedTeaNPPlugin.cc 2010-10-13 14:23:10.000000000 -0400
@@ -2355,6 +2355,10 @@ NP_Shutdown (void)
pthread_cancel(plugin_request_processor_thread2);
pthread_cancel(plugin_request_processor_thread3);
@@ -31,8 +31,8 @@ Otherwise, we may destroy mutex or condition variable in use.
java_to_plugin_bus->unSubscribe(plugin_req_proc);
plugin_to_java_bus->unSubscribe(java_req_proc);
//internal_bus->unSubscribe(java_req_proc);
---- icedtea6-1.9/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400
-+++ icedtea6-1.9/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-09-23 22:01:37.000000000 -0400
+--- icedtea6-1.9.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc.orig 2010-08-06 07:05:21.996828000 -0400
++++ icedtea6-1.9.1/plugin/icedteanp/IcedTeaPluginRequestProcessor.cc 2010-10-13 14:23:10.000000000 -0400
@@ -63,6 +63,12 @@ PluginRequestProcessor::PluginRequestPro
this->pendingRequests = new std::map<pthread_t, uintmax_t>();