/hg/icedtea6: 3 new changesets
dlila at icedtea.classpath.org
dlila at icedtea.classpath.org
Tue Jun 14 06:58:08 PDT 2011
changeset c15364504892 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=c15364504892
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 13 16:53:55 2011 -0400
Fix NPE in swing.
changeset 855179997c0a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=855179997c0a
author: Denis Lila <dlila at redhat.com>
date: Mon Jun 13 16:58:32 2011 -0400
merge
changeset 0e134aa56ccc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0e134aa56ccc
author: Denis Lila <dlila at redhat.com>
date: Tue Jun 14 09:02:14 2011 -0400
merge
diffstat:
ChangeLog | 23 ++++++
Makefile.am | 5 +-
NEWS | 1 +
patches/jtreg-ChangeDir.patch | 32 ++++++++
patches/jtreg-TempBuffer.patch | 60 ++++++++++++++++
patches/openjdk/7036148-npe-null-jmenu-name.patch | 83 +++++++++++++++++++++++
6 files changed, 203 insertions(+), 1 deletions(-)
diffs (247 lines):
diff -r c51663f190c9 -r 0e134aa56ccc ChangeLog
--- a/ChangeLog Fri Jun 10 22:58:13 2011 +0100
+++ b/ChangeLog Tue Jun 14 09:02:14 2011 -0400
@@ -1,3 +1,26 @@
+2011-06-14 Denis Lila <dlila at redhat.com>
+
+ * Makefile.am: Add patch.
+ * NEWS: Update with backports.
+ * patches/openjdk/7036148-npe-null-jmenu-name.patch:
+ Backport of S7036148. Fixes RH712211 too.
+
+2011-06-14 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * patches/jtreg-TempBuffer.patch:
+ Make sure that the regression test
+ openjdk/jdk/test/sun/nio/ch/TempBuffer.java
+ deletes all its work files.
+
+2011-06-14 Pavel Tisnovsky <ptisnovs at redhat.com>
+
+ * Makefile.am: added new patch
+ * patches/jtreg-ChangeDir.patch:
+ Make sure that the regression test
+ openjdk/jdk/test/tools/jar/ChangeDir.java
+ deletes all its work files.
+
2011-05-23 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Add security patches.
diff -r c51663f190c9 -r 0e134aa56ccc Makefile.am
--- a/Makefile.am Fri Jun 10 22:58:13 2011 +0100
+++ b/Makefile.am Tue Jun 14 09:02:14 2011 -0400
@@ -351,7 +351,10 @@
patches/openjdk/7037939-hugepage.patch \
patches/openjdk/7043564-hugepage.patch \
patches/openjdk/mutter.patch \
- patches/fonts-rhel-version.patch
+ patches/fonts-rhel-version.patch \
+ patches/openjdk/7036148-npe-null-jmenu-name.patch \
+ patches/jtreg-ChangeDir.patch \
+ patches/jtreg-TempBuffer.patch
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += \
diff -r c51663f190c9 -r 0e134aa56ccc NEWS
--- a/NEWS Fri Jun 10 22:58:13 2011 +0100
+++ b/NEWS Tue Jun 14 09:02:14 2011 -0400
@@ -33,6 +33,7 @@
- S6769607, PR677: Modal frame hangs for a while.
- S6578583: Modality is broken in windows vista home premium from jdk1.7 b02 onwards.
- S6610244: modal dialog closes with fatal error if -Xcheck:jni is set
+ - S7037283, RH712211: Null Pointer Exception in SwingUtilities2.
* Bug fixes
- PR637: make check should exit with an error code if any regression test failed.
- G356743: Support libpng 1.5.
diff -r c51663f190c9 -r 0e134aa56ccc patches/jtreg-ChangeDir.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-ChangeDir.patch Tue Jun 14 09:02:14 2011 -0400
@@ -0,0 +1,33 @@
+--- openjdk.orig/jdk/test/tools/jar/ChangeDir.java 2011-05-26 16:13:43.000000000 +0200
++++ openjdk/jdk/test/tools/jar/ChangeDir.java 2011-05-27 10:59:45.000000000 +0200
+@@ -63,11 +63,14 @@
+
+ static void doTest(String sep) throws Throwable {
+ File testDir = null;
++ File parentDir = null;
+ JarFile jf = null;
++ File tempFile = null;
+ try {
+ // Create a subdirectory "a/b"
+- File f = File.createTempFile("delete", ".me");
+- String dirName = f.getParent();
++ tempFile = File.createTempFile("delete", ".me");
++ String dirName = tempFile.getParent();
++ parentDir = new File(dirName + sep + "a");
+ testDir = new File(dirName + sep + "a" + sep + "b");
+ cleanup(testDir);
+ check(testDir.mkdirs());
+@@ -109,6 +112,13 @@
+ jf.close();
+ }
+ cleanup(testDir);
++ // clean all garbage recently created in temporary directory
++ if (parentDir != null) {
++ parentDir.delete();
++ }
++ if (tempFile != null) {
++ tempFile.delete();
++ }
+ }
+ }
+
diff -r c51663f190c9 -r 0e134aa56ccc patches/jtreg-TempBuffer.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/jtreg-TempBuffer.patch Tue Jun 14 09:02:14 2011 -0400
@@ -0,0 +1,61 @@
+--- openjdk.orig/jdk/test/sun/nio/ch/TempBuffer_orig.java 2011-02-28 17:07:06.000000000 +0100
++++ openjdk/jdk/test/sun/nio/ch/TempBuffer.java 2011-06-13 15:10:29.000000000 +0200
+@@ -48,18 +48,29 @@
+
+ Thread writerThread = new Thread() {
+ public void run() {
++ File blah = null;
+ try {
+ OutputStream out = Channels.newOutputStream(sinkChannel);
+- File blah = File.createTempFile("blah1", null);
++ blah = File.createTempFile("blah1", null);
+ blah.deleteOnExit();
+ TempBuffer.initTestFile(blah);
+ RandomAccessFile raf = new RandomAccessFile(blah, "rw");
+ FileChannel fs = raf.getChannel();
+- fs.transferTo(0, SIZE, Channels.newChannel(out));
++ try {
++ fs.transferTo(0, SIZE, Channels.newChannel(out));
++ } finally {
++ fs.close();
++ raf.close();
++ }
+ out.flush();
+ } catch (IOException ioe) {
+ throw new RuntimeException(ioe);
+ }
++ finally {
++ if (blah != null) {
++ blah.delete();
++ }
++ }
+ }
+ };
+
+@@ -70,9 +81,16 @@
+ blah.deleteOnExit();
+ RandomAccessFile raf = new RandomAccessFile(blah, "rw");
+ FileChannel fs = raf.getChannel();
+- raf.setLength(SIZE);
+- fs.transferFrom(Channels.newChannel(in), 0, SIZE);
+- fs.close();
++ try {
++ raf.setLength(SIZE);
++ fs.transferFrom(Channels.newChannel(in), 0, SIZE);
++ } finally {
++ fs.close();
++ }
++
++ sourceChannel.close();
++ sinkChannel.close();
++ blah.delete();
+ }
+
+ private static void initTestFile(File blah) throws IOException {
+@@ -89,5 +107,6 @@
+ }
+ awriter.flush();
+ awriter.close();
++ fos.close();
+ }
+ }
diff -r c51663f190c9 -r 0e134aa56ccc patches/openjdk/7036148-npe-null-jmenu-name.patch
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/7036148-npe-null-jmenu-name.patch Tue Jun 14 09:02:14 2011 -0400
@@ -0,0 +1,85 @@
+# HG changeset patch
+# User alexp
+# Date 1302889010 -14400
+# Node ID d353dcff4f14a1c7efcfb34a436e9ab3795ffcf9
+# Parent 71e769dc8cf689aad94c21a3b4b6f400a9f8f13c
+7036148: NullPointerException with null JMenu name
+Reviewed-by: rupashka
+
+diff -r 71e769dc8cf6 -r d353dcff4f14 src/share/classes/sun/swing/SwingUtilities2.java
+--- openjdk.orig/jdk/src/share/classes/sun/swing/SwingUtilities2.java Fri Apr 15 21:26:09 2011 +0400
++++ openjdk/jdk/src/share/classes/sun/swing/SwingUtilities2.java Fri Apr 15 21:36:50 2011 +0400
+@@ -270,11 +270,10 @@
+ */
+ public static int getLeftSideBearing(JComponent c, FontMetrics fm,
+ String string) {
+- int res = 0;
+- if (!string.isEmpty()) {
+- res = getLeftSideBearing(c, fm, string.charAt(0));
++ if ((string == null) || (string.length() == 0)) {
++ return 0;
+ }
+- return res;
++ return getLeftSideBearing(c, fm, string.charAt(0));
+ }
+
+ /**
+diff -r 71e769dc8cf6 -r d353dcff4f14 test/javax/swing/JMenuItem/7036148/bug7036148.java
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ openjdk/jdk/test/javax/swing/JMenuItem/7036148/bug7036148.java Fri Apr 15 21:36:50 2011 +0400
+@@ -0,0 +1,53 @@
++/*
++ * Copyright (c) 2011, Oracle and/or its affiliates. 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
++ */
++
++ /*
++ * @test
++ * @bug 7036148
++ * @summary NullPointerException with null JMenu name
++ * @author Alexander Potochkin
++ * @run main bug7036148
++ */
++
++
++import javax.swing.*;
++import java.awt.event.ActionEvent;
++
++public class bug7036148 extends JFrame {
++ public bug7036148() {
++ JMenuBar bar = new JMenuBar();
++ Action menuAction = new AbstractAction(null, null){
++ public void actionPerformed(ActionEvent e) {
++ }
++ };
++ JMenu menu = new JMenu(menuAction);
++ menu.add(new JMenuItem("test"));
++ bar.add(menu);
++ setJMenuBar(bar);
++ pack();
++ }
++
++ public static void main(String[] args) {
++ new bug7036148();
++ }
++}
+exporting patch:
+<fdopen>
More information about the distro-pkg-dev
mailing list