tomee-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1239358 - in /openejb/trunk/openejb/container: openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java openejb-core/src/main/resources/default.exclusions openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
Date Wed, 01 Feb 2012 22:04:21 GMT
Author: rmannibucau
Date: Wed Feb  1 22:04:20 2012
New Revision: 1239358

URL: http://svn.apache.org/viewvc?rev=1239358&view=rev
Log:
reusing IO class and adding some minor exclusions

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
    openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions
    openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java?rev=1239358&r1=1239357&r2=1239358&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
(original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/NewLoaderLogic.java
Wed Feb  1 22:04:20 2012
@@ -17,6 +17,7 @@
 package org.apache.openejb.config;
 
 import org.apache.openejb.loader.FileUtils;
+import org.apache.openejb.loader.IO;
 import org.apache.openejb.loader.Options;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.util.Join;
@@ -192,13 +193,7 @@ public class NewLoaderLogic {
         } catch (Throwable e) {
             // ignored
         } finally {
-            if (null != fis) {
-                try {
-                    fis.close();
-                } catch (Throwable e) {
-                    //Ignore
-                }
-            }
+            IO.close(fis);
         }
 
         if (exclusions == null) {
@@ -213,13 +208,7 @@ public class NewLoaderLogic {
             } catch (Throwable e) {
                 // ignored
             } finally {
-                if (null != is) {
-                    try {
-                        is.close();
-                    } catch (Throwable e) {
-                        //Ignore
-                    }
-                }
+                IO.close(is);
             }
         }
 

Modified: openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions?rev=1239358&r1=1239357&r2=1239358&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/resources/default.exclusions Wed
Feb  1 22:04:20 2012
@@ -33,6 +33,8 @@ cssparser-
 cxf-
 deploy.jar
 derby-
+derbyclient-
+derbynet-
 dom4j-
 geronimo-
 gragent.jar
@@ -78,6 +80,7 @@ neethi-
 nekohtml-
 openejb-api
 openejb-cxf-bundle
+openejb-hsql
 openejb-javaagent
 openejb-jee
 openejb-loader

Modified: openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java?rev=1239358&r1=1239357&r2=1239358&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
(original)
+++ openejb/trunk/openejb/container/openejb-loader/src/main/java/org/apache/openejb/loader/IO.java
Wed Feb  1 22:04:20 2012
@@ -210,7 +210,7 @@ public class IO {
         return new ZipInputStream(read);
     }
 
-    public static void close(Closeable closeable) throws IOException {
+    public static void close(Closeable closeable) {
         if (closeable == null) return;
         try {
             if (closeable instanceof Flushable) {



Mime
View raw message