stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8177758: Regression in java.awt.FileDialog

Browse Source 
Reviewed-by: sveerabhadra, serb
This commit is contained in:
Semyon Sadetsky 2017-12-08 12:55:21 -08:00
parent 2940eb8a25
commit c748c4426d
2 changed files with 74 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java.desktop/windows/native/libawt/windows/awt_FileDialog.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1996, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1996, 2017, 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
@ -259,13 +259,7 @@ AwtFileDialog::Show(void *p)
OPENFILENAME ofn;
memset(&ofn, 0, sizeof(ofn));
/*
* There's a situation (see bug 4906972) when InvokeFunction (by which this method is called)
* returnes earlier than this method returnes. Probably it's caused due to ReplyMessage system call.
* So for the avoidance of this mistiming we need to make new global reference here
* (not local as it's used by the hook) and then manage it independently of the calling thread.
*/
peer = env->NewGlobalRef((jobject)p);
peer = (jobject)p;
try {
DASSERT(peer);

72
test/jdk/java/awt/FileDialog/FileDialogMemoryLeak/FileDialogLeakTest.java Normal file
View File

@ -0,0 +1,72 @@
/*
* Copyright (c) 2017, 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.
*/
import java.awt.*;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
/**
* @test
* @bug 8177758
* @requires os.family == "windows"
* @summary Regression in java.awt.FileDialog
* @run main FileDialogLeakTest
*/
public class FileDialogLeakTest {
static CountDownLatch latch = new CountDownLatch(3);
static boolean passed;
public static void main(String[] args) throws Exception {
test();
System.gc();
System.runFinalization();
latch.await(1, TimeUnit.SECONDS);
if (!passed) {
throw new RuntimeException("Test failed.");
}
}
private static void test() throws Exception {
FileDialog fd = new FileDialog((Frame) null) {
@Override
protected void finalize() throws Throwable {
System.out.println("Finalize");
super.finalize();
passed = true;
latch.countDown();
}
};
new Thread(() -> {
latch.countDown();
fd.setVisible(true);
latch.countDown();
}).start();
latch.await(1, TimeUnit.SECONDS);
fd.dispose();
latch.await(1, TimeUnit.SECONDS);
}
}