1.1 --- a/src/share/vm/classfile/classLoader.hpp Tue Oct 28 09:17:36 2014 +0100 1.2 +++ b/src/share/vm/classfile/classLoader.hpp Mon Oct 13 16:09:57 2014 -0700 1.3 @@ -129,8 +129,8 @@ 1.4 bool _has_error; 1.5 bool _throw_exception; 1.6 volatile ClassPathEntry* _resolved_entry; 1.7 + public: 1.8 ClassPathEntry* resolve_entry(TRAPS); 1.9 - public: 1.10 bool is_jar_file(); 1.11 const char* name() { return _path; } 1.12 LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception); 1.13 @@ -218,7 +218,7 @@ 1.14 static void setup_meta_index(const char* meta_index_path, const char* meta_index_dir, 1.15 int start_index); 1.16 static void setup_bootstrap_search_path(); 1.17 - static void setup_search_path(const char *class_path); 1.18 + static void setup_search_path(const char *class_path, bool canonicalize=false); 1.19 1.20 static void load_zip_library(); 1.21 static ClassPathEntry* create_class_path_entry(const char *path, const struct stat* st, 1.22 @@ -329,6 +329,10 @@ 1.23 return e; 1.24 } 1.25 1.26 + static int num_classpath_entries() { 1.27 + return _num_entries; 1.28 + } 1.29 + 1.30 #if INCLUDE_CDS 1.31 // Sharing dump and restore 1.32 static void copy_package_info_buckets(char** top, char* end);