/hg/icedtea6: Backport S6986968: Crash on XIM server restart

[omajid at icedtea.classpath.org]

changeset 6b2f514d7874 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6b2f514d7874
author: Omair Majid <omajid at redhat.com>
date: Mon May 02 12:05:50 2011 -0400

	Backport S6986968: Crash on XIM server restart


diffstat:

 ChangeLog                                          |   6 ++++++
 Makefile.am                                        |   3 ++-
 NEWS                                               |   1 +
 patches/openjdk/6986968-crash_on_xim_restart.patch |  22 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletions(-)

diffs (64 lines):

diff -r c66866782611 -r 6b2f514d7874 ChangeLog
--- a/ChangeLog	Fri Apr 29 11:46:01 2011 -0400
+++ b/ChangeLog	Mon May 02 12:05:50 2011 -0400
@@ -1,3 +1,9 @@
+2011-05-02  Omair Majid  <omajid at redhat.com>
+
+	* NEWS: Update.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* patches/openjdk/6986968-crash_on_xim_restart.patch: New file.
+
 2011-04-29  Omair Majid  <omajid at redhat.com>
 
 	* NEWS: Update.
diff -r c66866782611 -r 6b2f514d7874 Makefile.am
--- a/Makefile.am	Fri Apr 29 11:46:01 2011 -0400
+++ b/Makefile.am	Mon May 02 12:05:50 2011 -0400
@@ -337,7 +337,8 @@
 	patches/revert-6885123.patch \
 	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
 	patches/openjdk/7031385-gcc-register-allocation-fix.patch \
-	patches/shark-llvm-2.9.patch
+	patches/shark-llvm-2.9.patch \
+	patches/openjdk/6986968-crash_on_xim_restart.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r c66866782611 -r 6b2f514d7874 NEWS
--- a/NEWS	Fri Apr 29 11:46:01 2011 -0400
+++ b/NEWS	Mon May 02 12:05:50 2011 -0400
@@ -21,6 +21,7 @@
   - S6748082: remove platform-specific code from SwingUtilities2.isDisplayLocal
   - S6708580: Java applications slow when EXA enabled
   - S7029905: demo applets missing some html files
+  - S6986968: Crash on XIM server restart
 * Bug fixes
   - PR637: make check should exit with an error code if any regression test failed.
   - G356743: Support libpng 1.5.
diff -r c66866782611 -r 6b2f514d7874 patches/openjdk/6986968-crash_on_xim_restart.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6986968-crash_on_xim_restart.patch	Mon May 02 12:05:50 2011 -0400
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User omajid
+# Date 1285601403 14400
+# Node ID bbadb9484f537ce1e6ecf6e0d1f130235367c7e4
+# Parent  278c8daa30750577cadb47f7c6c827d2dfb7d0bd
+6986968: Crash on XIM server restart
+Summary: Free XIM data structures on DestroyXIMCallback
+Reviewed-by: naoto
+
+diff -r 278c8daa3075 -r bbadb9484f53 src/solaris/native/sun/awt/awt_InputMethod.c
+--- openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Mon Sep 27 13:38:49 2010 +0400
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_InputMethod.c	Mon Sep 27 11:30:03 2010 -0400
+@@ -1473,6 +1473,10 @@
+ static void DestroyXIMCallback(XIM im, XPointer client_data, XPointer call_data) {
+     /* mark that XIM server was destroyed */
+     X11im = NULL;
++    JNIEnv* env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
++    /* free the old pX11IMData and set it to null. this also avoids crashing
++     * the jvm if the XIM server reappears */
++    X11InputMethodData *pX11IMData = getX11InputMethodData(env, currentX11InputMethodInstance);
+ }
+ 
+ /*