/hg/icedtea6: 2 new changesets
cpdev-commits at icedtea.classpath.org
cpdev-commits at icedtea.classpath.org
Fri Aug 21 06:19:39 PDT 2009
changeset 1e9bf43c720a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=1e9bf43c720a
summary: Backport regression (NPE) fix for AccessControlContext.
changeset 6c7d314c994f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=6c7d314c994f
summary: Merge
diffstat:
5 files changed, 108 insertions(+), 7 deletions(-)
ChangeLog | 17 ++++
HACKING | 1
Makefile.am | 1
patches/openjdk/6648816.patch | 82 +++++++++++++++++++++
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 14 +--
diffs (163 lines):
diff -r 13ec26d44a62 -r 6c7d314c994f ChangeLog
--- a/ChangeLog Fri Aug 21 09:55:52 2009 +0200
+++ b/ChangeLog Fri Aug 21 14:22:34 2009 +0100
@@ -1,3 +1,20 @@ 2009-08-21 Matthias Klose <doko at ubuntu
+2009-08-21 Xerxes RÃ¥nby <xerxes at zafena.se>
+
+ * Makefile.am:
+ Add new backported patch to fix
+ regression in AccessControlContext.
+ * HACKING: Updated.
+ * patches/openjdk/6648816.patch:
+ New.
+
+2009-08-20 Andrew John Hughes <ahughes at redhat.com>
+
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
+ (zero_cmpxchg_int): Updated method to match current Shark
+ and LLVM atomic calling convention.
+ Fixes compilation error and logic for ARM.
+ (zero_cmpxchg_ptr): Likewise.
+
2009-08-21 Matthias Klose <doko at ubuntu.com>
* Makefile.am (stamps/hotspot-tools-class-files.stamp,
diff -r 13ec26d44a62 -r 6c7d314c994f HACKING
--- a/HACKING Fri Aug 21 09:55:52 2009 +0200
+++ b/HACKING Fri Aug 21 14:22:34 2009 +0100
@@ -118,6 +118,7 @@ The following patches are only applied t
for rh-489586)
* icedtea-dnd-filelists.patch: Fix drag and drop behaviour when dragging a file list between JVMs (S5079469). Backported from OpenJDK.
* icedtea-signed-types-hot6.patch: Make use of unsigned/signed types explicit.
+* openjdk/6648816.patch: Backport of regression (NPE) fix in AccessControlContext
The following patches are only applied to OpenJDK in IcedTea:
diff -r 13ec26d44a62 -r 6c7d314c994f Makefile.am
--- a/Makefile.am Fri Aug 21 09:55:52 2009 +0200
+++ b/Makefile.am Fri Aug 21 14:22:34 2009 +0100
@@ -701,6 +701,7 @@ ICEDTEA_PATCHES += \
patches/icedtea-java2d-stroker-internal-close-joint.patch \
patches/icedtea-disable-cc-incompatible-sanity-checks.patch \
patches/icedtea-explicit-target-arch.patch \
+ patches/openjdk/6648816.patch \
$(DISTRIBUTION_PATCHES)
stamps/extract.stamp: stamps/download.stamp
diff -r 13ec26d44a62 -r 6c7d314c994f patches/openjdk/6648816.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6648816.patch Fri Aug 21 14:22:34 2009 +0100
@@ -0,0 +1,82 @@
+
+# HG changeset patch
+# User xuelei
+# Date 1205602985 14400
+# Node ID 7dc3b56f220faa1aa6418462eb362276599a045a
+# Parent 32e7ba670b0e599646931954ab2b0cc3feb1e7b4
+6648816: REGRESSION: setting -Djava.security.debug=failure result in NPE in ACC
+Summary: unchecking the null pointer of the debug handle
+Reviewed-by: mullan, weijun
+
+--- openjdk.orig/jdk/src/share/classes/java/security/AccessControlContext.java Fri Mar 14 10:33:21 2008 -0400
++++ openjdk/jdk/src/share/classes/java/security/AccessControlContext.java Sat Mar 15 13:43:05 2008 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright 1997-2006 Sun Microsystems, Inc. All Rights Reserved.
++ * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -322,7 +322,7 @@ public final class AccessControlContext
+ debug.println("access denied " + perm);
+ }
+
+- if (Debug.isOn("failure")) {
++ if (Debug.isOn("failure") && debug != null) {
+ // Want to make sure this is always displayed for failure,
+ // but do not want to display again if already displayed
+ // above.
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/java/security/AccessControlContext/FailureDebugOption.java Sat Mar 15 13:43:05 2008 -0400
+@@ -0,0 +1,50 @@
++/*
++ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++ *
++ * This code is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 2 only, as
++ * published by the Free Software Foundation.
++ *
++ * This code is distributed in the hope that it will be useful, but WITHOUT
++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++ * version 2 for more details (a copy is included in the LICENSE file that
++ * accompanied this code).
++ *
++ * You should have received a copy of the GNU General Public License version
++ * 2 along with this work; if not, write to the Free Software Foundation,
++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++ *
++ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
++ * CA 95054 USA or visit www.sun.com if you need additional information or
++ * have any questions.
++ */
++
++/*
++ * @test
++ * @bug 6648816
++ * @summary REGRESSION: setting -Djava.security.debug=failure result in NPE
++ * in ACC
++ * @run main/othervm -Djava.security.debug=failure FailureDebugOption
++ */
++
++import java.security.ProtectionDomain;
++import java.security.AccessController;
++import java.security.AccessControlException;
++import java.security.BasicPermission;
++
++public class FailureDebugOption {
++
++ public static void main (String argv[]) throws Exception {
++ try {
++ AccessController.checkPermission(
++ new BasicPermission("no such permission"){});
++ } catch (NullPointerException npe) {
++ throw new Exception("Unexpected NullPointerException for security" +
++ " debug option, -Djava.security.debug=failure");
++ } catch (AccessControlException ace) {
++ }
++ }
++}
++
+
diff -r 13ec26d44a62 -r 6c7d314c994f ports/hotspot/src/share/vm/shark/sharkBuilder.cpp
--- a/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Aug 21 09:55:52 2009 +0200
+++ b/ports/hotspot/src/share/vm/shark/sharkBuilder.cpp Fri Aug 21 14:22:34 2009 +0100
@@ -385,9 +385,9 @@ Value* SharkBuilder::uncommon_trap()
// perform these operations without delegating to a function.
#ifdef ARM
-static jint zero_cmpxchg_int(volatile jint *ptr, jint *oldval, jint newval)
-{
- return Atomic::cmpxchg(*newval, ptr, *oldval);
+static jint zero_cmpxchg_int(volatile jint *ptr, jint oldval, jint newval)
+{
+ return Atomic::cmpxchg(newval, ptr, oldval);
}
#endif // ARM
@@ -404,10 +404,10 @@ Value* SharkBuilder::cmpxchg_int()
#ifdef ARM
static intptr_t zero_cmpxchg_ptr(volatile intptr_t* ptr,
- intptr_t* oldval,
- intptr_t* newval)
-{
- return Atomic::cmpxchg_ptr(*newval, ptr, *oldval);
+ intptr_t oldval,
+ intptr_t newval)
+{
+ return Atomic::cmpxchg_ptr(newval, ptr, oldval);
}
#endif // ARM
More information about the distro-pkg-dev
mailing list