You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/10/09 12:08:54 UTC
svn commit: r1395939 - in
/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common:
IO.java Setup.java
Author: rmannibucau
Date: Tue Oct 9 10:08:54 2012
New Revision: 1395939
URL: http://svn.apache.org/viewvc?rev=1395939&view=rev
Log:
logging exception on system.properties writing
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java
openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java?rev=1395939&r1=1395938&r2=1395939&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/IO.java Tue Oct 9 10:08:54 2012
@@ -146,18 +146,27 @@ public class IO {
return new ZipInputStream(read);
}
- public static void close(Closeable closeable) throws IOException {
- if (closeable == null) return;
+ public static IOException close(Closeable closeable) throws IOException {
+ if (closeable == null) return null;
try {
if (closeable instanceof Flushable) {
((Flushable) closeable).flush();
}
} catch (IOException e) {
+ try {
+ closeable.close();
+ } catch (IOException e2) {
+ // no-op
+ } finally {
+ return e;
+ }
}
try {
closeable.close();
} catch (IOException e) {
+ return e;
}
+ return null;
}
public static boolean delete(File file) {
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java?rev=1395939&r1=1395938&r2=1395939&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-common/src/main/java/org/apache/openejb/arquillian/common/Setup.java Tue Oct 9 10:08:54 2012
@@ -289,7 +289,10 @@ public class Setup {
return;
} finally {
try {
- IO.close(writer);
+ final IOException ioe = IO.close(writer);
+ if (ioe != null) {
+ LOGGER.log(Level.SEVERE, "can't save system properties " + systemProperties.getAbsolutePath(), ioe);
+ }
} catch (IOException ignored) {
// no-op
}