*** old/src/hotspot/share/memory/metaspaceShared.cpp	Thu Mar  1 09:22:53 2018
--- new/src/hotspot/share/memory/metaspaceShared.cpp	Thu Mar  1 09:22:53 2018

*** 412,421 ****
--- 412,426 ----
    }
  }
  
  class CollectClassesClosure : public KlassClosure {
    void do_klass(Klass* k) {
+     if (!UseAppCDS && !k->class_loader_data()->is_the_null_class_loader_data()) {
+       // AppCDS is not enabled. Let's omit non-boot classes.
+       return;
+     }
+ 
      if (!(k->is_instance_klass() && InstanceKlass::cast(k)->is_in_error_state())) {
        _global_klass_objects->append_if_missing(k);
      }
      if (k->is_array_klass()) {
        // Add in the array classes too