Mercurial > hg > truffle
diff src/share/vm/classfile/classLoader.cpp @ 6966:6cb0d32b828b
8001185: parsing of sun.boot.library.path in os::dll_build_name somewhat broken
Summary: dll_dir can contain multiple paths, need to parse them correctly when loading agents
Reviewed-by: dholmes, dlong
Contributed-by: bill.pittore@oracle.com
| author | bpittore |
|---|---|
| date | Wed, 07 Nov 2012 17:53:02 -0500 |
| parents | da91efe96a93 |
| children | 2cb439954abf 90273fc0a981 |
line wrap: on
line diff
--- a/src/share/vm/classfile/classLoader.cpp Mon Nov 05 19:33:44 2012 -0500 +++ b/src/share/vm/classfile/classLoader.cpp Wed Nov 07 17:53:02 2012 -0500 @@ -605,8 +605,10 @@ // Load zip library char path[JVM_MAXPATHLEN]; char ebuf[1024]; - os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip"); - void* handle = os::dll_load(path, ebuf, sizeof ebuf); + void* handle = NULL; + if (os::dll_build_name(path, sizeof(path), Arguments::get_dll_dir(), "zip")) { + handle = os::dll_load(path, ebuf, sizeof ebuf); + } if (handle == NULL) { vm_exit_during_initialization("Unable to load ZIP library", path); }