*** old/src/share/vm/classfile/classLoaderData.cpp	Wed Dec 17 11:50:53 2014
--- new/src/share/vm/classfile/classLoaderData.cpp	Wed Dec 17 11:50:52 2014

*** 783,803 ****
--- 783,798 ----
    // mark metadata seen on the stack and code cache so we can delete unneeded entries.
    bool has_redefined_a_class = JvmtiExport::has_redefined_a_class();
    MetadataOnStackMark md_on_stack(has_redefined_a_class);
  
    if (has_redefined_a_class) {
      // purge_previous_versions also cleans weak method links. Because
      // one method's MDO can reference another method from another
      // class loader, we need to first clean weak method links for all
      // class loaders here. Below, we can then free redefined methods
      // for all class loaders.
      for (ClassLoaderData* data = _head; data != NULL; data = data->next()) {
        data->classes_do(InstanceKlass::purge_previous_versions);
      }
    }
  
!   // Need to purge the previous version before deallocating.
!   // Should purge the previous version before deallocating.
    free_deallocate_lists();
  }
  
  void ClassLoaderDataGraph::purge() {
    assert(SafepointSynchronize::is_at_safepoint(), "must be at safepoint!");

*** 831,842 ****
--- 826,835 ----
  #endif
  }
  
  void ClassLoaderDataGraph::free_deallocate_lists() {
    for (ClassLoaderData* cld = _head; cld != NULL; cld = cld->next()) {
      // We need to keep this data until InstanceKlass::purge_previous_version has been
      // called on all alive classes. See the comment in ClassLoaderDataGraph::clean_metaspaces.
      cld->free_deallocate_list();
    }
  }
  
  // CDS support