Mercurial > hg > release > icedtea6-1.11
view patches/openjdk/8012933-appcontext_disposed_too_early.patch @ 2912:d59bbf7333e0
Backport additional fixes.
Additional fixes were applied to jdk7u as part of the security release.
This patch includes a subset of them.
2013-07-01 Omair Majid <omajid@redhat.com>
* patches/openjdk/7188114-alternate_command_line_parser.patch,
* patches/openjdk/7199143-OCSP_timeout.patch,
* patches/openjdk/8006120-server_jre.patch,
* patches/openjdk/8006536-remove_trailing_slashes.patch,
* patches/openjdk/8009165-inappropriate_method_in_reflectutil.patch,
* patches/openjdk/8009217-fix_test_compile.patch,
* patches/openjdk/8009463-space_and_final_backslash.patch,
* patches/openjdk/8009610-blacklist_malware_certificate.patch,
* patches/openjdk/8010213-set_socketoptions_windows.patch,
* patches/openjdk/8010714-xml_dsig_retrievalmethod.patch,
* patches/openjdk/8011154-awt_regresssion.patch,
* patches/openjdk/8011313-OCSP_timeout_wrong_value.patch,
* patches/openjdk/8011992-MlibOpsTest_failed.patch,
* patches/openjdk/8012112-MlibOpsTest_fails.patch,
* patches/openjdk/8012617-arrayindexoutofbounds_linebreakmeasurer.patch,
* patches/openjdk/8012933-appcontext_disposed_too_early.patch,
* patches/openjdk/8013196-TimeZone_getDefault_throws_exception.patch,
* patches/openjdk/8014205-blank_swing_dialogs_windows.patch,
* patches/openjdk/8014427-raster_regresssion.patch,
* patches/openjdk/8014618-strip_leading_zeros_premastersecret.patch,
* patches/openjdk/8014676-javadebugger_space_in_paths.patch,
* patches/openjdk/8014968-OCSP_timeout_default.patch: New file.
Backport from icedtea/openjdk 7.
* Makefile.am (ICEDTEA_PATCHES): Apply the above.
* patches/ecj/override.patch: Add new hunk for BufferedImage.
* NEWS: Update with backports.
author | Omair Majid <omajid@redhat.com> |
---|---|
date | Mon, 01 Jul 2013 21:05:04 -0400 |
parents | |
children |
line wrap: on
line source
# HG changeset patch # User leonidr # Date 1367843442 -14400 # Node ID 55eaa0da2a8f6d9fe4966d3d9940258a1b0d4399 # Parent 20d3d11e8d9a2eb2a3324eae651e0f1549f95f86 8012933: Test closed/java/awt/Dialog/DialogAnotherThread/JaWSTest.java fails since jdk 7u25 b07 Summary: Do not mark context as disposed until we've posted all the events Reviewed-by: art --- openjdk/jdk/src/share/classes/sun/awt/AppContext.java +++ openjdk/jdk/src/share/classes/sun/awt/AppContext.java @@ -190,10 +190,16 @@ public static final String DISPOSED_PROPERTY_NAME = "disposed"; public static final String GUI_DISPOSED = "guidisposed"; - private boolean isDisposed = false; // true if AppContext is disposed + private enum State { + VALID, + BEING_DISPOSED, + DISPOSED + }; + + private volatile State state = State.VALID; public boolean isDisposed() { - return isDisposed; + return state == State.DISPOSED; } /* @@ -392,10 +398,11 @@ } synchronized(this) { - if (this.isDisposed) { - return; // If already disposed, bail. + if (this.state != State.VALID) { + return; // If already disposed or being disposed, bail. } - this.isDisposed = true; + + this.state = State.BEING_DISPOSED; } final PropertyChangeSupport changeSupport = this.changeSupport; @@ -465,6 +472,11 @@ } catch (InterruptedException e) { } } + // We are done with posting events, so change the state to disposed + synchronized(this) { + this.state = State.DISPOSED; + } + // Next, we interrupt all Threads in the ThreadGroup this.threadGroup.interrupt(); // Note, the EventDispatchThread we've interrupted may dump an new file mode 100644 --- /dev/null +++ openjdk/jdk/test/sun/awt/AppContext/8012933/Test8012933.java @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2013, 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 8012933 + * @summary Tests (although somewhat indirectly) that createNewAppContext() + * immediately followed by dispose() works correctly + * @author Leonid Romanov + */ + +import sun.awt.SunToolkit; +import sun.awt.AppContext; + +public class Test8012933 { + private AppContext appContext = null; + final ThreadGroup threadGroup = new ThreadGroup("test thread group"); + final Object lock = new Object(); + boolean isCreated = false; + + public static void main(String[] args) throws Exception { + SunToolkit.createNewAppContext(); + new Test8012933().test(); + } + + private void test() throws Exception { + createAppContext(); + long startTime = System.currentTimeMillis(); + appContext.dispose(); + long endTime = System.currentTimeMillis(); + + // In case of the bug, calling dispose() when there is no EQ + // dispatch thread running fails to create it, so it takes + // almost 10 sec to return from dispose(), which is spent + // waiting on the notificationLock. + if ((endTime - startTime) > 9000) { + throw new RuntimeException("Returning from dispose() took too much time, probably a bug"); + } + } + + private void createAppContext() { + isCreated = false; + final Runnable runnable = new Runnable() { + public void run() { + appContext = SunToolkit.createNewAppContext(); + synchronized (lock) { + isCreated = true; + lock.notifyAll(); + } + } + }; + + final Thread thread = new Thread(threadGroup, runnable, "creates app context"); + synchronized (lock) { + thread.start(); + while (!isCreated) { + try { + lock.wait(); + } catch (InterruptedException ie) { + ie.printStackTrace(); + } + } + } + + if (appContext == null) { + throw new RuntimeException("failed to create app context."); + } else { + System.out.println("app context was created."); + } + } + +}