# HG changeset patch
# User Roman Kennke <rkennke@redhat.com>
# Date 1418426092 -3600
# Node ID 52aeb8fe98ca4d8a08ed2c7eb865f518d537fcb4
# Parent  94b7293bdf5b16b282fd51662d7c420c0366dcbb
Fix two barriers in JNI implementation.

diff -r 94b7293bdf5b -r 52aeb8fe98ca src/share/vm/prims/jni.cpp
--- a/src/share/vm/prims/jni.cpp	Fri Dec 12 18:43:09 2014 +0100
+++ b/src/share/vm/prims/jni.cpp	Sat Dec 13 00:14:52 2014 +0100
@@ -3117,7 +3117,7 @@
     JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \
   } \
   oop o = id->holder()->java_mirror(); \
-  oopDesc::bs()->resolve_and_maybe_copy_oop(o); \
+  o = oopDesc::bs()->resolve_and_maybe_copy_oop(o); \
   o-> Fieldname##_field_put (id->offset(), value); \
   DTRACE_PROBE(hotspot_jni, SetStatic##Result##Field__return);\
 JNI_END
@@ -3150,7 +3150,7 @@
     JvmtiExport::jni_SetField_probe(thread, NULL, NULL, id->holder(), fieldID, true, SigType, (jvalue *)&field_value); \
   } \
   oop o = id->holder()->java_mirror(); \
-  oopDesc::bs()->resolve_and_maybe_copy_oop(o); \
+  o = oopDesc::bs()->resolve_and_maybe_copy_oop(o); \
   o-> Fieldname##_field_put (id->offset(), value); \
   ReturnProbe;\
 JNI_END