From 971184e060c910b3b5c5981234dee571bc970498 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 18 Jun 2000 22:14:06 +0000
Subject: 	* java/lang/natClass.cc (forName): Removed dead code. 
 Initialize 	returned class.  For PR gcj/260.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34590 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/lang/natClass.cc | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'libjava/java')

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 995e631ace5..33ab1a353da 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -80,13 +80,6 @@ java::lang::Class::forName (jstring className)
   if (! className)
     JvThrow (new java::lang::NullPointerException);
 
-#if 0
-  // FIXME: should check syntax of CLASSNAME and throw
-  // IllegalArgumentException on failure.
-
-  // FIXME: should use class loader from calling method.
-  jclass klass = _Jv_FindClass (className, NULL);
-#else
   jsize length = _Jv_GetStringUTFLength (className);
   char buffer[length];
   _Jv_GetStringUTFRegion (className, 0, length, buffer);
@@ -99,8 +92,10 @@ java::lang::Class::forName (jstring className)
   jclass klass = (buffer[0] == '[' 
 		  ? _Jv_FindClassFromSignature (name->data, NULL)
 		  : _Jv_FindClass (name, NULL));
-#endif
-  if (! klass)
+
+  if (klass)
+    _Jv_InitClass (klass);
+  else
     JvThrow (new java::lang::ClassNotFoundException (className));
 
   return klass;
-- 
cgit v1.2.3