Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 51335 invoked from network); 25 Jul 2004 08:12:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 25 Jul 2004 08:12:42 -0000 Received: (qmail 86616 invoked by uid 500); 25 Jul 2004 08:12:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 86594 invoked by uid 500); 25 Jul 2004 08:12:41 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 86579 invoked by uid 500); 25 Jul 2004 08:12:40 -0000 Delivered-To: apmail-incubator-geronimo-cvs@apache.org Received: (qmail 86576 invoked by uid 99); 25 Jul 2004 08:12:40 -0000 X-ASF-Spam-Status: No, hits=0.5 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.27.1) with SMTP; Sun, 25 Jul 2004 01:12:40 -0700 Received: (qmail 51324 invoked by uid 1712); 25 Jul 2004 08:12:40 -0000 Date: 25 Jul 2004 08:12:40 -0000 Message-ID: <20040725081240.51323.qmail@minotaur.apache.org> From: djencks@apache.org To: incubator-geronimo-cvs@apache.org Subject: cvs commit: incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment ENCConfigBuilder.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N djencks 2004/07/25 01:12:39 Modified: modules/naming/src/java/org/apache/geronimo/naming/deployment ENCConfigBuilder.java Log: better error message than npe Revision Changes Path 1.4 +7 -1 incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java Index: ENCConfigBuilder.java =================================================================== RCS file: /home/cvs/incubator-geronimo/modules/naming/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ENCConfigBuilder.java 25 Jun 2004 21:33:27 -0000 1.3 +++ ENCConfigBuilder.java 25 Jul 2004 08:12:39 -0000 1.4 @@ -65,6 +65,9 @@ throw new DeploymentException("could not load class " + type, e); } RefAdapter refAdapter = (RefAdapter) refAdapterMap.get(name); + if (refAdapter == null) { + throw new DeploymentException("No geronimo configuration for resource ref named: " + name); + } try { builder.addResourceRef(name, iface, refAdapter); } catch (NamingException e) { @@ -86,6 +89,9 @@ throw new DeploymentException("could not load class " + type, e); } RefAdapter refAdapter = (RefAdapter) refAdapterMap.get(name); + if (refAdapter == null) { + throw new DeploymentException("No geronimo configuration for resource env ref named: " + name); + } try { builder.addResourceRef(name, iface, refAdapter); } catch (NamingException e) {