From 17abdabcf3d4261dbebcc88cfaa1810b20811fe9 Mon Sep 17 00:00:00 2001
From: Bryce McKinlay <mckinlay@redhat.com>
Date: Fri, 21 May 2004 16:08:50 +0000
Subject: Layout interfaces during preparation, not initialization.

	* java/lang/natClass.cc (initializeClass): Move
	_Jv_LayoutInterfaceMethods call...
	* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): to here.

From-SVN: r82101
---
 libjava/java/lang/natClass.cc       | 3 ---
 libjava/java/lang/natClassLoader.cc | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'libjava/java')

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 3ceda11..ead9bce 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -790,9 +790,6 @@ java::lang::Class::initializeClass (void)
 	}
     }
 
-  if (isInterface ())
-    _Jv_LayoutInterfaceMethods (this);
-
   _Jv_PrepareConstantTimeTables (this);
 
   if (vtable == NULL)
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 9921d1d..ec48352 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -170,6 +170,9 @@ _Jv_PrepareCompiledClass (jclass klass)
     }
 #endif /* INTERPRETER */
 
+  if (klass->isInterface ())
+    _Jv_LayoutInterfaceMethods (klass);
+
   klass->notifyAll ();
 
   _Jv_PushClass (klass);
-- 
cgit v1.1