commit a663ea5de4c9ab6b1510fdebd6d8eca77ba699ae
author Brian Carlstrom <bdc@google.com> Fri Aug 19 23:33:41 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sun Aug 21 12:30:48 2011 -0700
tree 37078335c64cb760a0379a33eb4ceaf6b08356ea
parent 68f4fa09cfd72b4292cbe7a213f03da7902ba775

Initialize ClassLinker from image

Change-Id: Ibaf47b4181f7c6603a8b37e2eba8fa6509c927ed

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index bfa200a..3200e4d 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -526,9 +526,15 @@
 // TODO: get global references for these
 Class* String::java_lang_String_ = NULL;
 
-void String::InitClass(Class* java_lang_String) {
+void String::SetClass(Class* java_lang_String) {
+  CHECK(java_lang_String_ == NULL);
+  CHECK(java_lang_String != NULL);
   java_lang_String_ = java_lang_String;
 }
+void String::ResetClass() {
+  CHECK(java_lang_String_ != NULL);
+  java_lang_String_ = NULL;
+}
 
 static const char* kClassStatusNames[] = {
   "Error",