From e23786d215a538516b4e4f33d11abbdf32296e15 Mon Sep 17 00:00:00 2001
From: tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 3 Sep 2002 21:33:46 +0000
Subject: 	* java/lang/Class.h (_getDeclaredMethod): Declare. 
 (_getMethod): Now private. 	* java/lang/natClass.cc (_getDeclaredMethod):
 Renamed from 	getDeclaredMethod.  Now returns NULL on failure. 	*
 java/lang/Class.java (_getDeclaredMethod): Declare. 	(getDeclaredMethod):
 No longer native; implements access checks.

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

(limited to 'libjava/java/lang/natClass.cc')

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 43b79adc9b6..fca074152ce 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -315,8 +315,8 @@ java::lang::Class::getSignature (JArray<jclass> *param_types,
 }
 
 java::lang::reflect::Method *
-java::lang::Class::getDeclaredMethod (jstring name,
-				      JArray<jclass> *param_types)
+java::lang::Class::_getDeclaredMethod (jstring name,
+				       JArray<jclass> *param_types)
 {
   jstring partial_sig = getSignature (param_types, false);
   jint p_len = partial_sig->length();
@@ -324,7 +324,6 @@ java::lang::Class::getDeclaredMethod (jstring name,
   int i = isPrimitive () ? 0 : method_count;
   while (--i >= 0)
     {
-      // FIXME: access checks.
       if (_Jv_equalUtf8Consts (methods[i].name, utf_name)
 	  && _Jv_equaln (methods[i].signature, partial_sig, p_len))
 	{
@@ -336,7 +335,7 @@ java::lang::Class::getDeclaredMethod (jstring name,
 	  return rmethod;
 	}
     }
-  throw new java::lang::NoSuchMethodException;
+  return NULL;
 }
 
 JArray<java::lang::reflect::Method *> *
-- 
cgit v1.2.3