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

6571600: JNI use results in UnsatisfiedLinkError looking for libmawt.so

Browse Source 
Fix is to call dladdr with name less likely to cause name conflict.

Reviewed-by: serb, anthony
This commit is contained in:
David Buck 2013-12-23 11:57:03 -08:00
parent 2273f9252a
commit 3722bb2766
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2000, 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2000, 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
@ -109,7 +109,7 @@ AWT_OnLoad(JavaVM *vm, void *reserved)
jvm = vm;
/* Get address of this library and the directory containing it. */
dladdr((void *)JNI_OnLoad, &dlinfo);
dladdr((void *)AWT_OnLoad, &dlinfo);
realpath((char *)dlinfo.dli_fname, buf);
len = strlen(buf);
p = strrchr(buf, '/');