ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-12 23:44:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Support built-in jars when wusing multi-library

Browse Source
This commit is contained in:
Alexey Pelykh 2013-02-02 12:27:36 +02:00
parent 0ff703d1c0
commit 1d60ababd3
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jnienv.cpp
View File

@ -3729,7 +3729,7 @@ JNI_CreateJavaVM(Machine** m, Thread** t, void* args)
unsigned heapLimit = 0; unsigned heapLimit = 0;
unsigned stackLimit = 0; unsigned stackLimit = 0;
const char* bootLibrary = 0; const char* bootLibraries = 0;
const char* classpath = 0; const char* classpath = 0;
const char* javaHome = AVIAN_JAVA_HOME; const char* javaHome = AVIAN_JAVA_HOME;
const char* embedPrefix = AVIAN_EMBED_PREFIX; const char* embedPrefix = AVIAN_EMBED_PREFIX;
@ -3765,7 +3765,7 @@ JNI_CreateJavaVM(Machine** m, Thread** t, void* args)
if (strncmp(p, BOOTSTRAP_PROPERTY "=", if (strncmp(p, BOOTSTRAP_PROPERTY "=",
sizeof(BOOTSTRAP_PROPERTY)) == 0) sizeof(BOOTSTRAP_PROPERTY)) == 0)
{ {
bootLibrary = p + sizeof(BOOTSTRAP_PROPERTY); bootLibraries = p + sizeof(BOOTSTRAP_PROPERTY);
} else if (strncmp(p, CRASHDIR_PROPERTY "=", } else if (strncmp(p, CRASHDIR_PROPERTY "=",
sizeof(CRASHDIR_PROPERTY)) == 0) sizeof(CRASHDIR_PROPERTY)) == 0)
{ {
@ -3819,9 +3819,16 @@ JNI_CreateJavaVM(Machine** m, Thread** t, void* args)
*RUNTIME_ARRAY_BODY(bootClasspathBuffer) = 0; *RUNTIME_ARRAY_BODY(bootClasspathBuffer) = 0;
} }
char* bootLibrary = bootLibraries ? strdup(bootLibraries) : 0;
char* bootLibraryEnd = bootLibrary ? strchr(bootLibrary, PATH_SEPARATOR) : 0;
if(bootLibraryEnd)
*bootLibraryEnd = 0;
Finder* bf = makeFinder Finder* bf = makeFinder
(s, h, RUNTIME_ARRAY_BODY(bootClasspathBuffer), bootLibrary); (s, h, RUNTIME_ARRAY_BODY(bootClasspathBuffer), bootLibrary);
Finder* af = makeFinder(s, h, classpath, bootLibrary); Finder* af = makeFinder(s, h, classpath, bootLibrary);
if(bootLibrary)
free(bootLibrary);
Processor* p = makeProcessor(s, h, true); Processor* p = makeProcessor(s, h, true);
const char** properties = static_cast<const char**> const char** properties = static_cast<const char**>