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

8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris

Browse Source 
Reviewed-by: dholmes, anthony, ahgross, erikj
This commit is contained in:
Kumar Srinivasan 2013-08-14 10:17:57 -07:00
parent 53b5f75095
commit 73aa07b6c5
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jdk/src/solaris/bin/java_md_solinux.c
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -958,9 +958,27 @@ static void* hSplashLib = NULL;
void* SplashProcAddress(const char* name) { void* SplashProcAddress(const char* name) {
if (!hSplashLib) { if (!hSplashLib) {
const char * splashLibPath; int ret;
splashLibPath = SPLASHSCREEN_SO; char jrePath[MAXPATHLEN];
hSplashLib = dlopen(splashLibPath, RTLD_LAZY | RTLD_GLOBAL); char splashPath[MAXPATHLEN];
if (!GetJREPath(jrePath, sizeof(jrePath), GetArch(), JNI_FALSE)) {
JLI_ReportErrorMessage(JRE_ERROR1);
return NULL;
}
ret = JLI_Snprintf(splashPath, sizeof(splashPath), "%s/lib/%s/%s",
jrePath, GetArch(), SPLASHSCREEN_SO);
if (ret >= (int) sizeof(splashPath)) {
JLI_ReportErrorMessage(JRE_ERROR11);
return NULL;
}
if (ret < 0) {
JLI_ReportErrorMessage(JRE_ERROR13);
return NULL;
}
hSplashLib = dlopen(splashPath, RTLD_LAZY | RTLD_GLOBAL);
JLI_TraceLauncher("Info: loaded %s\n", splashPath);
} }
if (hSplashLib) { if (hSplashLib) {
void* sym = dlsym(hSplashLib, name); void* sym = dlsym(hSplashLib, name);