modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/CompareDigestActionHandler.java | 5 +-- modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java | 16 ++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-)
New commits: commit 86b070e80ddf96df954e976613464d7af120a977 Author: Lukas Krejci lkrejci@redhat.com Date: Tue Aug 10 16:42:19 2010 +0200
Make sure to not fail when close() method of a stream throws an exception.
diff --git a/modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/CompareDigestActionHandler.java b/modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/CompareDigestActionHandler.java index 08303c8..6bee4b2 100644 --- a/modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/CompareDigestActionHandler.java +++ b/modules/common/jboss-as/src/main/java/com/jboss/jbossnetwork/product/jbpm/handlers/CompareDigestActionHandler.java @@ -26,6 +26,7 @@ import java.io.FileInputStream; import java.security.DigestInputStream; import java.security.MessageDigest; import org.jbpm.graph.exe.ExecutionContext; +import org.rhq.core.util.stream.StreamUtil;
/** * @author Jason Dobies @@ -115,9 +116,7 @@ public class CompareDigestActionHandler extends BaseHandler { while (in.read(buffer) != -1) { } } finally { - if (in != null) { - in.close(); - } + StreamUtil.safeClose(in); }
String digest = HandlerUtils.encode(messageDigest.digest());
commit 41a3463a600a4014ed650d96c9fbd604dd4e8ba5 Author: Lukas Krejci lkrejci@redhat.com Date: Tue Aug 10 16:38:49 2010 +0200
Adding a utility method for safely closing streams.
diff --git a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java index e970b83..e84d7d4 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/stream/StreamUtil.java @@ -25,6 +25,7 @@ package org.rhq.core.util.stream; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.Closeable; import java.io.IOException; import java.io.InputStream; import java.io.ObjectInputStream; @@ -245,4 +246,19 @@ public class StreamUtil {
return retObject; } + + /** + * Can be used to safely close a stream. No-op if the stream is null. + * + * @param stream the stream to close or null + */ + public static void safeClose(Closeable stream) { + if (stream != null) { + try { + stream.close(); + } catch (IOException e) { + LOG.error("Failed to close a stream.", e); + } + } + } } \ No newline at end of file
rhq-commits@lists.fedorahosted.org