From 680abc87618a3632f18ac2141626fbd6f05dc93e Mon Sep 17 00:00:00 2001
From: bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 28 Dec 2000 04:33:53 +0000
Subject: 	* java/lang/natClass.cc (_Jv_IsAssignableFrom): Primitive
 TYPEs can 	not be assigned to Object.

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

(limited to 'libjava/java')

diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc
index 2eec179fa64..4d45d07e39c 100644
--- a/libjava/java/lang/natClass.cc
+++ b/libjava/java/lang/natClass.cc
@@ -909,8 +909,8 @@ _Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
 jboolean
 _Jv_IsAssignableFrom (jclass target, jclass source)
 {
-  if (target == &ObjectClass 
-      || source == target 
+  if (source == target
+      || (target == &ObjectClass && !source->isPrimitive())
       || (source->ancestors != NULL 
           && source->ancestors[source->depth - target->depth] == target))
      return true;
-- 
cgit v1.2.3