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

[maguro]

maguro      2004/11/21 09:17:05

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

  Should delete the temp file before using it since the windows JVM may still 
be holding on to it.
  
  Revision  Changes    Path
  1.10      +21 -16    
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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- OpenEJBModuleBuilder.java 19 Nov 2004 03:58:59 -0000      1.9
  +++ OpenEJBModuleBuilder.java 21 Nov 2004 14:17:05 -0000      1.10
  @@ -1,6 +1,6 @@
   /* ====================================================================
    * Redistribution and use of this software and associated documentation
  - * ("Software"), with or without modification, are permitted provided
  +  * ("Software"), with or without modification, are permitted provided
    * that the following conditions are met:
    *
    * 1. Redistributions of source code must retain copyright
  @@ -299,21 +299,26 @@
           entityBuilder.initContext(earContext, moduleJ2eeContext, moduleUri, 
cl, enterpriseBeans, interfaces);
           mdbBuilder.initContext(cl, enterpriseBeans);
   
  -        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 {
  +        if (skeletonGenerator != null) {
  +            File tempJar = null;
  +            try {
  +                tempJar = DeploymentUtil.createTempFile();
  +
  +                /**
  +                 * Windoze may be holding on to this
  +                 */               
  +                tempJar.delete();
  +
  +                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 {
                   DeploymentUtil.recursiveDelete(tempJar);
  -             }
  +            }
           }
       }