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

8189604: possible hang in sun.awt.shell.Win32ShellFolder2$KnownFolderDefinition::<clinit>

Browse Source 
Reviewed-by: prr, kaddepalli
This commit is contained in:
Sergey Bylokhov 2018-07-05 19:05:08 +03:00
parent f85a6f0677
commit 4f38d4ff72
3 changed files with 75 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/java.desktop/windows/classes/sun/awt/shell/Win32ShellFolder2.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, 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
@ -170,7 +170,7 @@ final class Win32ShellFolder2 extends ShellFolder {
}
// Known Folder data
static class KnownFolderDefinition {
static final class KnownFolderDefinition {
String guid;
int category;
String name;
@ -187,7 +187,10 @@ final class Win32ShellFolder2 extends ShellFolder {
String ftidType;
String path;
String saveLocation;
static final List<KnownFolderDefinition> libraries = getLibraries();
}
static final class KnownLibraries {
static final List<KnownFolderDefinition> INSTANCE = getLibraries();
}
static class FolderDisposer implements sun.java2d.DisposerRecord {
@ -625,7 +628,7 @@ final class Win32ShellFolder2 extends ShellFolder {
// this is a temp fix until java.io starts support Libraries
if( path != null && path.startsWith("::{") &&
path.toLowerCase().endsWith(".library-ms")) {
for (KnownFolderDefinition kf : KnownFolderDefinition.libraries) {
for (KnownFolderDefinition kf : KnownLibraries.INSTANCE) {
if (path.toLowerCase().endsWith(
"\\" + kf.relativePath.toLowerCase()) &&
path.toUpperCase().startsWith(

4
src/java.desktop/windows/native/libawt/windows/ShellFolder2.cpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2003, 2018, 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
@ -1398,7 +1398,7 @@ JNIEXPORT jobjectArray JNICALL Java_sun_awt_shell_Win32ShellFolder2_loadKnownFol
DEFINE_FIELD_ID(field_defenitionFlags, cl, "defenitionFlags", "I");
DEFINE_FIELD_ID(field_ftidType, cl, "ftidType", "Ljava/lang/String;");
jobjectArray result;
jobjectArray result = NULL;
KNOWNFOLDERID* pFoldersIds = NULL;
UINT count = 0;
if (SUCCEEDED(pkfm->GetFolderIds(&pFoldersIds, &count))) {

66
test/jdk/javax/swing/reliability/HangDuringStaticInitialization.java Normal file
View File

@ -0,0 +1,66 @@
/*
* Copyright (c) 2018, 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.net.URI;
import java.nio.file.FileSystem;
import java.nio.file.FileSystems;
import java.nio.file.FileVisitResult;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
/**
* @test
* @bug 8189604
* @run main/othervm -Djava.awt.headless=false HangDuringStaticInitialization
* @run main/othervm -Djava.awt.headless=true HangDuringStaticInitialization
*/
public final class HangDuringStaticInitialization {
public static void main(final String[] args) throws Exception {
FileSystem fs = FileSystems.getFileSystem(URI.create("jrt:/"));
test(fs, "/modules/java.desktop");
test(fs, "/modules/java.datatransfer");
}
private static void test(FileSystem fs, String s) throws Exception {
Files.walkFileTree(fs.getPath(s), new SimpleFileVisitor<>() {
@Override
public FileVisitResult visitFile(Path file,
BasicFileAttributes attrs) {
file = file.subpath(2, file.getNameCount());
String name = file.toString();
if (name.endsWith(".class")) {
name = name.substring(0, name.indexOf(".")).replace('/', '.');
try {
Class.forName(name, true, null);
} catch (Throwable e) {
// only the crash / hang will be considered as failure
}
}
return FileVisitResult.CONTINUE;
}
});
}
}