Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 31227 invoked from network); 4 Jul 2007 08:47:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jul 2007 08:47:26 -0000 Received: (qmail 31930 invoked by uid 500); 4 Jul 2007 08:47:29 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 31837 invoked by uid 500); 4 Jul 2007 08:47:29 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 31828 invoked by uid 99); 4 Jul 2007 08:47:29 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 01:47:29 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 01:47:26 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E8CD41A981A; Wed, 4 Jul 2007 01:47:05 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r553126 - in /harmony/enhanced/classlib/trunk/modules/beans/src: main/java/java/beans/beancontext/BeanContextSupport.java test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Date: Wed, 04 Jul 2007 08:47:05 -0000 To: commits@harmony.apache.org From: pyang@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070704084705.E8CD41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pyang Date: Wed Jul 4 01:47:04 2007 New Revision: 553126 URL: http://svn.apache.org/viewvc?view=rev&rev=553126 Log: BeanContextSupport.classEquals() should throw NPE on null parameters Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Modified: harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?view=diff&rev=553126&r1=553125&r2=553126 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Wed Jul 4 01:47:04 2007 @@ -425,6 +425,9 @@ * @return true if two class objects are equal or their class names are equal. */ protected static final boolean classEquals(Class clz1, Class clz2) { + if (clz1 == null || clz2 == null) { + throw new NullPointerException(); + } return clz1 == clz2 || clz1.getName().equals(clz2.getName()); } Modified: harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java?view=diff&rev=553126&r1=553125&r2=553126 ============================================================================== --- harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java (original) +++ harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java Wed Jul 4 01:47:04 2007 @@ -823,6 +823,12 @@ Integer.class)); assertFalse(MockBeanContextSupport.publicClassEquals(Integer.class, Double.class)); + try { + MockBeanContextSupport.publicClassEquals(null, null); + fail("should throw NullPointerException"); + } catch (NullPointerException e) { + // expected. + } } public void testClear() {