diff options
| author | Elliott Hughes <enh@google.com> | 2013-01-09 13:44:30 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2013-01-09 13:44:30 -0800 |
| commit | c5dc2ff2d1beb3ff84f93d2c7ebe07c46b76956a (patch) | |
| tree | fa26fad2e5cf942fee87350c11766dc30c771855 | |
| parent | df42c4815c30b9df15aacb88070c1e94f41d0226 (diff) | |
| download | art-c5dc2ff2d1beb3ff84f93d2c7ebe07c46b76956a.zip art-c5dc2ff2d1beb3ff84f93d2c7ebe07c46b76956a.tar.gz art-c5dc2ff2d1beb3ff84f93d2c7ebe07c46b76956a.tar.bz2 | |
Remove references to the now-useless ThreadLock class.
Change-Id: Ic644ff8a5d1fa8fc209aba1441a265ecac2778be
| -rw-r--r-- | src/monitor.cc | 2 | ||||
| -rw-r--r-- | src/well_known_classes.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/monitor.cc b/src/monitor.cc index 2584f9d..70dfd24 100644 --- a/src/monitor.cc +++ b/src/monitor.cc @@ -852,7 +852,7 @@ void Monitor::DescribeWait(std::ostream& os, const Thread* thread) { // - waiting on <0x6008c468> (a java.lang.Class<java.lang.ref.ReferenceQueue>) os << "<" << object << "> (a " << PrettyTypeOf(object) << ")"; - // - waiting to lock <0x613f83d8> (a java.lang.ThreadLock) held by thread 5 + // - waiting to lock <0x613f83d8> (a java.lang.Object) held by thread 5 if (lock_owner != ThreadList::kInvalidId) { os << " held by thread " << lock_owner; } diff --git a/src/well_known_classes.cc b/src/well_known_classes.cc index 6a0e709..caf42ee 100644 --- a/src/well_known_classes.cc +++ b/src/well_known_classes.cc @@ -165,7 +165,7 @@ void WellKnownClasses::Init(JNIEnv* env) { java_lang_Thread_daemon = CacheField(env, java_lang_Thread, false, "daemon", "Z"); java_lang_Thread_group = CacheField(env, java_lang_Thread, false, "group", "Ljava/lang/ThreadGroup;"); - java_lang_Thread_lock = CacheField(env, java_lang_Thread, false, "lock", "Ljava/lang/ThreadLock;"); + java_lang_Thread_lock = CacheField(env, java_lang_Thread, false, "lock", "Ljava/lang/Object;"); java_lang_Thread_name = CacheField(env, java_lang_Thread, false, "name", "Ljava/lang/String;"); java_lang_Thread_priority = CacheField(env, java_lang_Thread, false, "priority", "I"); java_lang_Thread_uncaughtHandler = CacheField(env, java_lang_Thread, false, "uncaughtHandler", "Ljava/lang/Thread$UncaughtExceptionHandler;"); |