From 02db2f969edd56345247608768189ce5d1f6a185 Mon Sep 17 00:00:00 2001
From: sspitsyn <unknown>
Date: Mon, 3 Jun 2013 14:28:37 -0700
Subject: [PATCH] 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

---
 src/share/vm/prims/jvmtiRedefineClasses.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/share/vm/prims/jvmtiRedefineClasses.cpp b/src/share/vm/prims/jvmtiRedefineClasses.cpp
index c5715345f..e92796972 100644
--- a/src/share/vm/prims/jvmtiRedefineClasses.cpp
+++ b/src/share/vm/prims/jvmtiRedefineClasses.cpp
@@ -1349,12 +1349,11 @@ bool VM_RedefineClasses::merge_constant_pools(constantPoolHandle old_cp,
         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()
-- 
GitLab