commit 0045a290e6b79a274250e3112880c04bde437d4a
author Ian Rogers <irogers@google.com> Sat Mar 31 21:08:41 2012 -0700
committer Ian Rogers <irogers@google.com> Sat Mar 31 22:38:22 2012 -0700
tree a125d556b6c817218b14f6f3f72079b83d0032c4
parent d23f5206cf72ca3fb53ac3049649bb7d018232bf

Avoid a case of eager initialization.

Don't mark as initialized classes that contain static field
initialization.

Change-Id: Iedcabbdf355e8861eb7731650eee1467f68ae0cd

src/java_lang_Class.cc

diff --git a/src/java_lang_Class.cc b/src/java_lang_Class.cc
index 20af47a..fcd1689 100644
--- a/src/java_lang_Class.cc
+++ b/src/java_lang_Class.cc
@@ -68,7 +68,7 @@
     return NULL;
   }
   if (initialize) {
-    class_linker->EnsureInitialized(c, true);
+    class_linker->EnsureInitialized(c, true, true);
   }
   return AddLocalReference<jclass>(env, c);
 }
@@ -403,7 +403,7 @@
     return NULL;
   }
 
-  if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(c, true)) {
+  if (!Runtime::Current()->GetClassLinker()->EnsureInitialized(c, true, true)) {
     return NULL;
   }