Move dex file registration in ti_redefine.
AppendToBootClassPath includes dex file registration,
so it was being registered twice on that code path.
Test: test.py -b -r --host --64
Change-Id: I14146e38e21958b557151f046da6b898e685b688
diff --git a/openjdkjvmti/ti_redefine.cc b/openjdkjvmti/ti_redefine.cc
index 12d00ad..487d9da 100644
--- a/openjdkjvmti/ti_redefine.cc
+++ b/openjdkjvmti/ti_redefine.cc
@@ -2487,9 +2487,11 @@
// At this point we can no longer fail without corrupting the runtime state.
for (RedefinitionDataIter data = holder.begin(); data != holder.end(); ++data) {
art::ClassLinker* cl = runtime_->GetClassLinker();
- cl->RegisterExistingDexCache(data.GetNewDexCache(), data.GetSourceClassLoader());
if (data.GetSourceClassLoader() == nullptr) {
+ // AppendToBootClassPath includes dex file registration.
cl->AppendToBootClassPath(self_, &data.GetRedefinition().GetDexFile());
+ } else {
+ cl->RegisterExistingDexCache(data.GetNewDexCache(), data.GetSourceClassLoader());
}
}
UnregisterAllBreakpoints();