Mercurial > hg > truffle
comparison src/os/solaris/launcher/java_md.c @ 388:f008d3631bd1
6755845: JVM_FindClassFromBoot triggers assertions
Summary: Fixes assertions caused by one jvm_entry calling another, solved by refactoring code and modified gamma test.
Reviewed-by: dholmes, xlu
| author | ksrini |
|---|---|
| date | Wed, 08 Oct 2008 08:10:51 -0700 |
| parents | a61af66fc99e |
| children | ad8c8ca4ab0f |
comparison
equal
deleted
inserted
replaced
| 387:fad66fdcb7fc | 388:f008d3631bd1 |
|---|---|
| 1824 int | 1824 int |
| 1825 UnsetEnv(char *name) | 1825 UnsetEnv(char *name) |
| 1826 { | 1826 { |
| 1827 return(borrowed_unsetenv(name)); | 1827 return(borrowed_unsetenv(name)); |
| 1828 } | 1828 } |
| 1829 | |
| 1830 /* | |
| 1831 * The implementation for finding classes from the bootstrap | |
| 1832 * class loader, refer to java.h | |
| 1833 */ | |
| 1834 static FindClassFromBootLoader_t *findBootClass = NULL; | |
| 1835 | |
| 1836 jclass | |
| 1837 FindBootStrapClass(JNIEnv *env, const char* classname) | |
| 1838 { | |
| 1839 if (findBootClass == NULL) { | |
| 1840 findBootClass = (FindClassFromBootLoader_t *)dlsym(RTLD_DEFAULT, | |
| 1841 "JVM_FindClassFromBootLoader"); | |
| 1842 if (findBootClass == NULL) { | |
| 1843 fprintf(stderr, "Error: could not load method JVM_FindClassFromBootLoader"); | |
| 1844 return NULL; | |
| 1845 } | |
| 1846 } | |
| 1847 return findBootClass(env, classname, JNI_FALSE); | |
| 1848 } | |
| 1849 |