# HG changeset patch
# User Roman Kennke <rkennke@redhat.com>
# Date 1418295583 -3600
# Node ID e71997fba947772d54b64e7ea4eb953dff703846
# Parent  21d3b0133d61de351d50da38f7328dc86e3cae42
Reverted some non-critical parts of last changeset.

diff -r 21d3b0133d61 -r e71997fba947 src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentThread.cpp
--- a/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentThread.cpp	Wed Dec 10 17:18:53 2014 +0100
+++ b/src/share/vm/gc_implementation/shenandoah/shenandoahConcurrentThread.cpp	Thu Dec 11 11:59:43 2014 +0100
@@ -151,12 +151,6 @@
       // yield();
     }
   }
-
-  // Release any threads waiting for full-gc. We won't do it ;-)
-  MonitorLockerEx ml(ShenandoahFullGC_lock);
-  _do_full_gc = false;
-  ml.notify_all();
-
 }
 
 void ShenandoahConcurrentThread::do_full_gc() {
diff -r 21d3b0133d61 -r e71997fba947 src/share/vm/oops/instanceKlass.cpp
--- a/src/share/vm/oops/instanceKlass.cpp	Wed Dec 10 17:18:53 2014 +0100
+++ b/src/share/vm/oops/instanceKlass.cpp	Thu Dec 11 11:59:43 2014 +0100
@@ -2516,7 +2516,7 @@
 }
 
 address InstanceKlass::static_field_addr(int offset) {
-  return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(oopDesc::bs()->resolve_and_maybe_copy_oop(java_mirror())));
+  return (address)(offset + InstanceMirrorKlass::offset_of_static_fields() + cast_from_oop<intptr_t>(java_mirror()));
 }