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) {