Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 3555 invoked from network); 25 Apr 2006 11:03:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 25 Apr 2006 11:03:14 -0000 Received: (qmail 71285 invoked by uid 500); 25 Apr 2006 11:03:12 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 71231 invoked by uid 500); 25 Apr 2006 11:03:12 -0000 Mailing-List: contact harmony-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: harmony-dev@incubator.apache.org Delivered-To: mailing list harmony-commits@incubator.apache.org Received: (qmail 71220 invoked by uid 99); 25 Apr 2006 11:03:12 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2006 04:03:12 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 25 Apr 2006 04:03:11 -0700 Received: (qmail 3305 invoked by uid 65534); 25 Apr 2006 11:02:41 -0000 Message-ID: <20060425110241.3302.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r396838 - in /incubator/harmony/enhanced/classlib/trunk/modules/beans/src: main/java/java/beans/Beans.java test/java/org/apache/harmony/tests/java/beans/BeansTest.java Date: Tue, 25 Apr 2006 11:02:40 -0000 To: harmony-commits@incubator.apache.org From: mloenko@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mloenko Date: Tue Apr 25 04:02:36 2006 New Revision: 396838 URL: http://svn.apache.org/viewcvs?rev=396838&view=rev Log: fixes for HARMONY-402: java.beans.Beans.InstanceOf(Object bean,Class targetType) method works incorrectly Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Beans.java incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Beans.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Beans.java?rev=396838&r1=396837&r2=396838&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Beans.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Beans.java Tue Apr 25 04:02:36 2006 @@ -144,7 +144,11 @@ * @com.intel.drl.spec_ref */ public static boolean isInstanceOf(Object bean, Class targetType) { - return bean.getClass().isAssignableFrom(targetType); + if (targetType == null) { + return false; + } else { + return targetType.isInstance(bean); + } } /** Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java?rev=396838&r1=396837&r2=396838&view=diff ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/tests/java/beans/BeansTest.java Tue Apr 25 04:02:36 2006 @@ -22,7 +22,10 @@ import org.apache.harmony.tests.java.beans.auxiliary.SampleBean; import java.beans.Beans; +import java.io.Externalizable; import java.io.IOException; +import java.io.ObjectInput; +import java.io.ObjectOutput; import junit.framework.Test; import junit.framework.TestCase; @@ -105,6 +108,18 @@ } assertNotNull(Beans.instantiate(null, this.getClass().getName())); } + + //regression test for HARMONY-402 + public void test_isInstanceOf_Object_Class() { + ObjectBean bean = new ObjectBean(); + // correct non-null targetType + Class targetType = Externalizable.class; + assertTrue(Beans.isInstanceOf(bean, targetType)); + + // null targetType + targetType = null; + assertFalse(Beans.isInstanceOf(bean, targetType)); + } /** * @@ -132,4 +147,9 @@ private void checkValues(SampleBean sampleBean) { assertEquals(null, sampleBean.getText()); } + + private class ObjectBean implements Externalizable { + public void writeExternal(ObjectOutput out) {}; + public void readExternal(ObjectInput in){}; + } }