Mercurial > hg > truffle
diff src/share/vm/runtime/arguments.cpp @ 21513:d760a7d64801
Graal loader: load all .jar files (regardless of graal prefix)
| author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
|---|---|
| date | Wed, 06 May 2015 16:54:59 +0200 |
| parents | e121783a0df9 |
| children | 28cbfacd0518 |
line wrap: on
line diff
--- a/src/share/vm/runtime/arguments.cpp Tue May 05 17:56:23 2015 +0200 +++ b/src/share/vm/runtime/arguments.cpp Wed May 06 16:54:59 2015 +0200 @@ -3621,7 +3621,7 @@ #ifdef GRAAL if (!UseGraalClassLoader) { - // Append lib/graal/graal*.jar to boot class path + // Append lib/graal/*.jar to boot class path char graalDir[JVM_MAXPATHLEN]; const char* fileSep = os::file_separator(); jio_snprintf(graalDir, sizeof(graalDir), "%s%slib%sgraal", Arguments::get_java_home(), fileSep, fileSep); @@ -3632,9 +3632,7 @@ while ((entry = os::readdir(dir, (dirent *) dbuf)) != NULL) { const char* name = entry->d_name; const char* ext = name + strlen(name) - 4; - if (ext > name && strcmp(ext, ".jar") == 0 - && strlen(name) > strlen("graal") - && strncmp(name, "graal", strlen("graal")) == 0) { + if (ext > name && strcmp(ext, ".jar") == 0) { char fileName[JVM_MAXPATHLEN]; jio_snprintf(fileName, sizeof(fileName), "%s%s%s", graalDir, fileSep, name); scp_p->add_suffix(fileName);