--- a/hotspot/src/share/vm/runtime/safepoint.cpp Fri Jul 10 16:01:20 2009 -0700
+++ b/hotspot/src/share/vm/runtime/safepoint.cpp Tue Jul 14 15:40:39 2009 -0700
@@ -49,7 +49,7 @@
// In the future we should investigate whether CMS can use the
// more-general mechanism below. DLD (01/05).
ConcurrentMarkSweepThread::synchronize(false);
- } else {
+ } else if (UseG1GC) {
ConcurrentGCThread::safepoint_synchronize();
}
#endif // SERIALGC
@@ -400,7 +400,7 @@
// If there are any concurrent GC threads resume them.
if (UseConcMarkSweepGC) {
ConcurrentMarkSweepThread::desynchronize(false);
- } else {
+ } else if (UseG1GC) {
ConcurrentGCThread::safepoint_desynchronize();
}
#endif // SERIALGC