infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-21 10:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

6588003: LayoutQueue shares mutable implementation across AppContexts

Browse Source 
DefaultQueue property is made per-AppContext

Reviewed-by: alexp
This commit is contained in:
Peter Zhelezniakov 2009-02-04 18:48:24 +03:00
parent 798600a691
commit 06d5f1e07f
2 changed files with 81 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jdk/src/share/classes/javax/swing/text/LayoutQueue.java
View File

@ -25,6 +25,7 @@
package javax.swing.text;
import java.util.Vector;
import sun.awt.AppContext;
/**
* A queue of text layout tasks.
@ -35,10 +36,10 @@ import java.util.Vector;
*/
public class LayoutQueue {
Vector<Runnable> tasks;
Thread worker;
private static final Object DEFAULT_QUEUE = new Object();
static LayoutQueue defaultQueue;
private Vector<Runnable> tasks;
private Thread worker;
/**
* Construct a layout queue.
@ -51,19 +52,31 @@ public class LayoutQueue {
* Fetch the default layout queue.
*/
public static LayoutQueue getDefaultQueue() {
if (defaultQueue == null) {
defaultQueue = new LayoutQueue();
AppContext ac = AppContext.getAppContext();
synchronized (DEFAULT_QUEUE) {
LayoutQueue defaultQueue = (LayoutQueue) ac.get(DEFAULT_QUEUE);
if (defaultQueue == null) {
defaultQueue = new LayoutQueue();
ac.put(DEFAULT_QUEUE, defaultQueue);
}
return defaultQueue;
}
return defaultQueue;
}
/**
* Set the default layout queue.
*
* @param q the new queue.
* @param defaultQueue the new queue.
*/
public static void setDefaultQueue(LayoutQueue q) {
defaultQueue = q;
public static void setDefaultQueue(LayoutQueue defaultQueue) {
synchronized (DEFAULT_QUEUE) {
AppContext ac = AppContext.getAppContext();
if (defaultQueue == null) {
ac.remove(DEFAULT_QUEUE);
} else {
ac.put(DEFAULT_QUEUE, defaultQueue);
}
}
}
/**

59
jdk/test/javax/swing/text/LayoutQueue/Test6588003.java Normal file
View File

@ -0,0 +1,59 @@
/*
* Copyright 2007 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 6588003
@summary LayoutQueue should not share its DefaultQueue across AppContexts
@author Peter Zhelezniakov
@run main Test6588003
*/
import javax.swing.text.LayoutQueue;
import sun.awt.SunToolkit;
public class Test6588003 implements Runnable {
private static final LayoutQueue DEFAULT = new LayoutQueue();
public static void main(String[] args) throws InterruptedException {
LayoutQueue.setDefaultQueue(DEFAULT);
ThreadGroup group = new ThreadGroup("Test6588003");
Thread thread = new Thread(group, new Test6588003());
thread.start();
thread.join();
if (LayoutQueue.getDefaultQueue() != DEFAULT) {
throw new RuntimeException("Sharing detected");
}
}
public void run() {
SunToolkit.createNewAppContext();
if (LayoutQueue.getDefaultQueue() == DEFAULT) {
throw new RuntimeException("Sharing detected");
}
LayoutQueue.setDefaultQueue(new LayoutQueue());
}
}