[openejb-scm] openejb/modules/openejb-builder/src/java/org/openejb/deployment OpenEJBModuleBuilder.java

[chirino]

chirino     2004/11/11 09:21:13

  Modified:    modules/openejb-builder/src/java/org/openejb/deployment
                        OpenEJBModuleBuilder.java
  Log:

  Nullpointer check in case skeleton generator is not provided.
  
  Revision  Changes    Path
  1.5       +16 -14    
openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java
  
  Index: OpenEJBModuleBuilder.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- OpenEJBModuleBuilder.java 10 Nov 2004 19:45:45 -0000      1.4
  +++ OpenEJBModuleBuilder.java 11 Nov 2004 14:21:13 -0000      1.5
  @@ -301,19 +301,21 @@
           entityBuilder.initContext(earContext, moduleJ2eeContext, moduleUri, 
cl, enterpriseBeans, interfaces);
           mdbBuilder.initContext(cl, enterpriseBeans);
   
  -        File tempJar = null;
  -        try {
  -            tempJar = DeploymentUtil.createTempFile();
  -
  -            skeletonGenerator.generateSkeletons(interfaces, tempJar, cl);
  -
  -            earContext.addIncludeAsPackedJar(URI.create("corba.jar"), new 
JarFile(tempJar));
  -        } catch (IOException e) {
  -            throw new DeploymentException("Unable to generate CORBA skels 
for: " + moduleUri, e);
  -        } catch (CompilerException e) {
  -            throw new DeploymentException("Unable to generate CORBA skels 
for: " + moduleUri, e);
  -        } finally {
  -            tempJar.delete();
  +        if( skeletonGenerator!=null ) {
  +             File tempJar = null;
  +             try {
  +                 tempJar = DeploymentUtil.createTempFile();
  +     
  +                 skeletonGenerator.generateSkeletons(interfaces, tempJar, 
cl);
  +     
  +                 earContext.addIncludeAsPackedJar(URI.create("corba.jar"), 
new JarFile(tempJar));
  +             } catch (IOException e) {
  +                 throw new DeploymentException("Unable to generate CORBA 
skels for: " + moduleUri, e);
  +             } catch (CompilerException e) {
  +                 throw new DeploymentException("Unable to generate CORBA 
skels for: " + moduleUri, e);
  +             } finally {
  +                 tempJar.delete();
  +             }
           }
       }