/hg/icedtea6: Replace fix for S6599601 with a proper backport

[omajid at icedtea.classpath.org]

changeset e080e9d33821 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e080e9d33821
author: Omair Majid <omajid at redhat.com>
date: Tue May 10 13:35:19 2011 -0400

	Replace fix for S6599601 with a proper backport

	2011-05-10 Omair Majid <omajid at redhat.com>

	 * Makefile.am (ICEDTEA_PATCHES): Update patch location and
	name.
	       * patches/mark_sun_toolkit_privileged_code.patch: Remove.
	       * patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch: New
	file. Backport from OpenJDK6.


diffstat:

 ChangeLog                                                      |   8 +++
 Makefile.am                                                    |   2 +-
 patches/mark_sun_toolkit_privileged_code.patch                 |  11 -----
 patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch |  21 ++++++++++
 4 files changed, 30 insertions(+), 12 deletions(-)

diffs (69 lines):

diff -r 8720a7df46e3 -r e080e9d33821 ChangeLog
--- a/ChangeLog	Tue May 10 09:41:12 2011 -0400
+++ b/ChangeLog	Tue May 10 13:35:19 2011 -0400
@@ -1,3 +1,11 @@
+2011-05-10  Omair Majid  <omajid at redhat.com>
+
+	Move fix for S6599601 to proper location.
+	* Makefile.am (ICEDTEA_PATCHES): Update patch location and name.
+	* patches/mark_sun_toolkit_privileged_code.patch: Remove.
+	* patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch: New
+	file. Backport from OpenJDK6.
+
 2011-05-10  Andrew Su  <asu at redhat.com>
 
 	* Makefile.am:
diff -r 8720a7df46e3 -r e080e9d33821 Makefile.am
--- a/Makefile.am	Tue May 10 09:41:12 2011 -0400
+++ b/Makefile.am	Tue May 10 13:35:19 2011 -0400
@@ -330,7 +330,7 @@
 	patches/openjdk/7027667-AAShapePipeRegTest.patch \
 	patches/openjdk/7019861-AA-regression-fix.patch \
 	patches/openjdk/6768387-jtable_not_serializable.patch \
-	patches/mark_sun_toolkit_privileged_code.patch \
+	patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch \
 	patches/g356743-libpng-1.5.patch \
 	patches/revert-6885123.patch \
 	patches/hotspot/$(HSBUILD)/7032388-work_without_cmov_instruction.patch \
diff -r 8720a7df46e3 -r e080e9d33821 patches/mark_sun_toolkit_privileged_code.patch
--- a/patches/mark_sun_toolkit_privileged_code.patch	Tue May 10 09:41:12 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
---- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.orig.java	2011-03-11 10:48:29.000000000 +0100
-+++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	2011-03-11 11:24:33.000000000 +0100
-@@ -65,8 +65,7 @@
-
-     /* Load debug settings for native code */
-     static {
--        String nativeDebug = System.getProperty("sun.awt.nativedebug");
--        if ("true".equalsIgnoreCase(nativeDebug)) {
-+        if (AccessController.doPrivileged(new GetBooleanAction("sun.awt.nativedebug"))) {
-             DebugSettings.init();
-         }
-     };
diff -r 8720a7df46e3 -r e080e9d33821 patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6599601-mark_sun_toolkit_privileged_code.patch	Tue May 10 13:35:19 2011 -0400
@@ -0,0 +1,22 @@
+# HG changeset patch
+# User ptisnovs
+# Date 1305021522 -7200
+# Node ID fe6a8ddfe33d460fe19867c6625ee6390934e4b7
+# Parent  593007922695685523c0730db47e379c26490967
+6599601: Permissions/AWTWindowTest and Permissions/DFLoadTest failed in PIT 7.0 B20 on Windows Vista
+Summary: Correction of checking sun.awt.nativedebug flag.
+Reviewed-by: ohair
+
+diff -r 593007922695 -r fe6a8ddfe33d src/share/classes/sun/awt/SunToolkit.java
+--- openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	Tue Jan 11 12:36:43 2011 -0500
++++ openjdk/jdk/src/share/classes/sun/awt/SunToolkit.java	Tue May 10 11:58:42 2011 +0200
+@@ -70,8 +70,7 @@
+ 
+     /* Load debug settings for native code */
+     static {
+-        String nativeDebug = System.getProperty("sun.awt.nativedebug");
+-        if ("true".equalsIgnoreCase(nativeDebug)) {
++        if (AccessController.doPrivileged(new GetBooleanAction("sun.awt.nativedebug"))) {
+             DebugSettings.init();
+         }
+     };