--- a/hotspot/src/share/vm/runtime/safepoint.cpp	Thu May 15 17:38:50 2014 -0400
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp	Thu May 15 18:23:26 2014 -0400
@@ -541,6 +541,13 @@
     gclog_or_tty->rotate_log(false);
   }
 
+  {
+    // CMS delays purging the CLDG until the beginning of the next safepoint and to
+    // make sure concurrent sweep is done
+    TraceTime t7("purging class loader data graph", TraceSafepointCleanupTime);
+    ClassLoaderDataGraph::purge_if_needed();
+  }
+
   if (MemTracker::is_on()) {
     MemTracker::sync();
   }