*** old/src/share/vm/classfile/classLoader.hpp	Thu Feb 12 09:40:40 2015
--- new/src/share/vm/classfile/classLoader.hpp	Thu Feb 12 09:40:39 2015

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 31,52 ****
--- 31,40 ----
  
  // The VM class loader.
  #include <sys/stat.h>
  
  
  // Meta-index (optional, to be able to skip opening boot classpath jar files)
  class MetaIndex: public CHeapObj<mtClass> {
   private:
    char** _meta_package_names;
    int    _num_meta_package_names;
   public:
    MetaIndex(char** meta_package_names, int num_meta_package_names);
    ~MetaIndex();
    bool may_contain(const char* class_name);
  };
  
  
  // Class path entry (directory or zip file)
  
  class ClassPathEntry: public CHeapObj<mtClass> {
   private:
    ClassPathEntry* _next;

*** 120,130 ****
--- 108,117 ----
  // For lazier loading of boot class path entries
  class LazyClassPathEntry: public ClassPathEntry {
   private:
    const char* _path; // dir or file
    struct stat _st;
    MetaIndex* _meta_index;
    bool _has_error;
    bool _throw_exception;
    volatile ClassPathEntry* _resolved_entry;
    ClassPathEntry* resolve_entry(TRAPS);
   public:

*** 133,143 ****
--- 120,129 ----
    LazyClassPathEntry(const char* path, const struct stat* st, bool throw_exception);
    virtual ~LazyClassPathEntry();
    u1* open_entry(const char* name, jint* filesize, bool nul_terminate, TRAPS);
  
    ClassFileStream* open_stream(const char* name, TRAPS);
    void set_meta_index(MetaIndex* meta_index) { _meta_index = meta_index; }
    virtual bool is_lazy();
    // Debugging
    NOT_PRODUCT(void compile_the_world(Handle loader, TRAPS);)
    NOT_PRODUCT(bool is_jrt();)
  };

*** 229,241 ****
--- 215,224 ----
    // Adds a new package entry for the specified class or package name and
    // corresponding directory or jar file name.
    static bool add_package(const char *pkgname, int classpath_index, TRAPS);
  
    // Initialization
    static void setup_bootstrap_meta_index();
    static void setup_meta_index(const char* meta_index_path, const char* meta_index_dir,
                                 int start_index);
    static void setup_bootstrap_search_path();
    static void setup_search_path(const char *class_path);
  
    static void load_zip_library();
    static ClassPathEntry* create_class_path_entry(const char *path, const struct stat* st,