diff options
| author | Sebastien Hertz <shertz@google.com> | 2013-12-12 15:52:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-12 15:52:26 +0000 |
| commit | f288bd1b268bbbd94c163c9c23bdd20e42bbc36b (patch) | |
| tree | 9e70a2778d34bfd5ca096d27c254c2639346b033 /runtime/jdwp | |
| parent | ff8d298c9a937822492e85b264bc0c4a3b3642a9 (diff) | |
| parent | e96060aa2483529d087031f7cdcc0405f1ef9218 (diff) | |
| download | art-f288bd1b268bbbd94c163c9c23bdd20e42bbc36b.zip art-f288bd1b268bbbd94c163c9c23bdd20e42bbc36b.tar.gz art-f288bd1b268bbbd94c163c9c23bdd20e42bbc36b.tar.bz2 | |
Merge "Manage JDWP errors related to garbage collection."
Diffstat (limited to 'runtime/jdwp')
| -rw-r--r-- | runtime/jdwp/object_registry.cc | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/runtime/jdwp/object_registry.cc b/runtime/jdwp/object_registry.cc index 7408e92..369eddd 100644 --- a/runtime/jdwp/object_registry.cc +++ b/runtime/jdwp/object_registry.cc @@ -133,9 +133,7 @@ void ObjectRegistry::DisableCollection(JDWP::ObjectId id) { Thread* self = Thread::Current(); MutexLock mu(self, lock_); id_iterator it = id_to_entry_.find(id); - if (it == id_to_entry_.end()) { - return; - } + CHECK(it != id_to_entry_.end()); Promote(*(it->second)); } @@ -143,9 +141,7 @@ void ObjectRegistry::EnableCollection(JDWP::ObjectId id) { Thread* self = Thread::Current(); MutexLock mu(self, lock_); id_iterator it = id_to_entry_.find(id); - if (it == id_to_entry_.end()) { - return; - } + CHECK(it != id_to_entry_.end()); Demote(*(it->second)); } @@ -175,9 +171,7 @@ bool ObjectRegistry::IsCollected(JDWP::ObjectId id) { Thread* self = Thread::Current(); MutexLock mu(self, lock_); id_iterator it = id_to_entry_.find(id); - if (it == id_to_entry_.end()) { - return true; // TODO: can we report that this was an invalid id? - } + CHECK(it != id_to_entry_.end()); ObjectRegistryEntry& entry = *(it->second); if (entry.jni_reference_type == JNIWeakGlobalRefType) { |