Return-Path: Delivered-To: apmail-incubator-harmony-commits-archive@www.apache.org Received: (qmail 43507 invoked from network); 4 Sep 2006 07:36:15 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 4 Sep 2006 07:36:15 -0000 Received: (qmail 27056 invoked by uid 500); 4 Sep 2006 07:36:15 -0000 Delivered-To: apmail-incubator-harmony-commits-archive@incubator.apache.org Received: (qmail 26961 invoked by uid 500); 4 Sep 2006 07:36:15 -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 26950 invoked by uid 99); 4 Sep 2006 07:36:15 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2006 00:36:14 -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-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Sep 2006 00:36:14 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0472F1A981A; Mon, 4 Sep 2006 00:35:54 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r439967 - in /incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java: java/beans/beancontext/BeanContextSupport.java org/apache/harmony/beans/internal/nls/messages.properties Date: Mon, 04 Sep 2006 07:35:53 -0000 To: harmony-commits@incubator.apache.org From: mloenko@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060904073554.0472F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: mloenko Date: Mon Sep 4 00:35:52 2006 New Revision: 439967 URL: http://svn.apache.org/viewvc?view=rev&rev=439967 Log: applied patch for HARMONY-1169 [classlib][beans] no expected IllegalArgumentException for BeanContextSupport.getResource(...) fixed internationalization in the patch Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?view=diff&rev=439967&r1=439966&r2=439967 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Mon Sep 4 00:35:52 2006 @@ -779,7 +779,12 @@ throw new NullPointerException(Messages.getString("beans.2C")); //$NON-NLS-1$ } - // Load resource using the same ClassLoader as BeanContextChild specified + if (!containsKey(bcc)) { + throw new IllegalArgumentException(Messages.getString("beans.46")); //$NON-NLS-1$ + } + + // Load resource using the same ClassLoader as BeanContextChild + // specified // If NullPointerException occurs try to load it as system resource try { return bcc.getClass().getClassLoader().getResource(name); @@ -807,6 +812,10 @@ // The child should not be null if (bcc == null) { throw new NullPointerException(Messages.getString("beans.2C")); //$NON-NLS-1$ + } + + if (!containsKey(bcc)) { + throw new IllegalArgumentException(Messages.getString("beans.46")); //$NON-NLS-1$ } // Load resource using the same ClassLoader as BeanContextChild specified Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties?view=diff&rev=439967&r1=439966&r2=439967 ============================================================================== --- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties (original) +++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/internal/nls/messages.properties Mon Sep 4 00:35:52 2006 @@ -84,3 +84,4 @@ beans.43=Cannot convert {0} to char beans.44=for property {0} no getter(setter) is found beans.45=method name is not generated: error in getMethodName() +beans.46=Not a valid child