gdamour     2004/08/13 01:16:30

  Modified:    modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment
                        EARConfigBuilder.java
  Log:
  GERONIMO-286 detected by Toby Cabot.
  
  If an EAR DD defines a client application module, a NullPointerException was raised. This is now fixed.
  
  Revision  Changes    Path
  1.21      +7 -5      incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
  
  Index: EARConfigBuilder.java
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/j2ee/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- EARConfigBuilder.java	9 Aug 2004 04:19:35 -0000	1.20
  +++ EARConfigBuilder.java	13 Aug 2004 08:16:29 -0000	1.21
  @@ -498,11 +498,13 @@
                       moduleLocations.add(uri.toString());
                       connectorModules.add(currentModule);
                   }
  -                moduleMap.put(currentModule.getName(), currentModule);
                   // TODO remove test against null when application clients will be supported.
  -                if ( module.isSetAltDd() && null != currentModule ) {
  -                    URL altDDURL = appLocator.toURL(module.getAltDd().getStringValue());
  -                    currentModule.setAltSpecDD(altDDURL);
  +                if ( null != currentModule ) {
  +                    moduleMap.put(currentModule.getName(), currentModule);
  +                    if ( module.isSetAltDd() ) {
  +                        URL altDDURL = appLocator.toURL(module.getAltDd().getStringValue());
  +                        currentModule.setAltSpecDD(altDDURL);
  +                    }
                   }
               }