# HG changeset patch
# User sspitsyn
# Date 1370294917 25200
# Node ID 29aa71317b5162054c44e7f62a72fa8f5a496683
# Parent  d77007cf03c1903da66a88c1aff606dd1852354a
8014052: JSR292: assert(end_offset == next_offset) failed: matched ending
Summary: A call to the finalize_operands_merge() must be unconditional
Reviewed-by: kvn, twisti
Contributed-by: serguei.spitsyn@oracle.com

diff -r d77007cf03c1 -r 29aa71317b51 hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp	Mon Jun 03 10:00:10 2013 -0400
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.cpp	Mon Jun 03 14:28:37 2013 -0700
@@ -1349,12 +1349,11 @@
         CHECK_0);
     }
 
-    finalize_operands_merge(*merge_cp_p, THREAD);
-
     RC_TRACE_WITH_THREAD(0x00020000, THREAD,
       ("after pass 1b: merge_cp_len=%d, scratch_i=%d, index_map_len=%d",
       *merge_cp_length_p, scratch_i, _index_map_count));
   }
+  finalize_operands_merge(*merge_cp_p, THREAD);
 
   return true;
 } // end merge_constant_pools()