svn commit: r1424418 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java

[andygumbrecht]

Author: andygumbrecht
Date: Thu Dec 20 11:47:13 2012
New Revision: 1424418

URL: http://svn.apache.org/viewvc?rev=1424418&view=rev
Log:
Cleanup.

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java?rev=1424418&r1=1424417&r2=1424418&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/CmpJarBuilder.java
 Thu Dec 20 11:47:13 2012
@@ -73,7 +73,6 @@ public class CmpJarBuilder {
             return;
         }
 
-        boolean threwException = false;
         JarOutputStream jarOutputStream = null;
 
         try {
@@ -94,19 +93,16 @@ public class CmpJarBuilder {
                 // System.out.println(appInfo.cmpMappingsXml);
                 addJarEntry(jarOutputStream, 
"META-INF/openejb-cmp-generated-orm.xml", appInfo.cmpMappingsXml.getBytes());
             }
-        } catch (IOException e) {
-            threwException = true;
-            throw e;
-        } finally {
-
-            close(jarOutputStream);
+        } catch (Throwable e) {
 
-            if (threwException) {
-                if (null != jarFile && !jarFile.delete()) {
-                    jarFile.deleteOnExit();
-                }
-                jarFile = null;
+            if (null != jarFile && !jarFile.delete()) {
+                jarFile.deleteOnExit();
             }
+            jarFile = null;
+
+            throw new IOException("CmpJarBuilder.generate()", e);
+        } finally {
+            close(jarOutputStream);
         }
     }