You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/01/23 21:08:42 UTC
svn commit: r1234966 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/impl/
camel-core/src/main/java/org/apache/camel/util/
components/camel-crypto/src/main/java/org/apache/camel/converter/...
Author: bvahdat
Date: Mon Jan 23 20:08:41 2012
New Revision: 1234966
URL: http://svn.apache.org/viewvc?rev=1234966&view=rev
Log:
Introduced another overloaded IOHelper.close() variant with varargs and it's usage (shorthand-writing)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java
camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/builder/ExpressionBuilder.java Mon Jan 23 20:08:41 2012
@@ -480,8 +480,7 @@ public final class ExpressionBuilder {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
exception.printStackTrace(pw);
- IOHelper.close(pw);
- IOHelper.close(sw);
+ IOHelper.close(pw, sw);
return sw.toString();
} else {
return null;
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/GzipDataFormat.java Mon Jan 23 20:08:41 2012
@@ -36,8 +36,7 @@ public class GzipDataFormat implements D
try {
IOHelper.copy(is, zipOutput);
} finally {
- IOHelper.close(is);
- IOHelper.close(zipOutput);
+ IOHelper.close(is, zipOutput);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/impl/ZipDataFormat.java Mon Jan 23 20:08:41 2012
@@ -47,8 +47,7 @@ public class ZipDataFormat implements Da
try {
IOHelper.copy(is, zipOutput);
} finally {
- IOHelper.close(is);
- IOHelper.close(zipOutput);
+ IOHelper.close(is, zipOutput);
}
}
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/util/IOHelper.java Mon Jan 23 20:08:41 2012
@@ -182,8 +182,7 @@ public final class IOHelper {
}
public static void copyAndCloseInput(InputStream input, OutputStream output) throws IOException {
- copy(input, output);
- close(input, null, LOG);
+ copyAndCloseInput(input, output, DEFAULT_BUFFER_SIZE);
}
public static void copyAndCloseInput(InputStream input, OutputStream output, int bufferSize) throws IOException {
@@ -234,6 +233,17 @@ public final class IOHelper {
close(closeable, null, LOG);
}
+ /**
+ * Closes the given resources if they are available.
+ *
+ * @param closeables the objects to close
+ */
+ public static void close(Closeable... closeables) {
+ for (Closeable closeable : closeables) {
+ close(closeable, null, LOG);
+ }
+ }
+
public static void validateCharset(String charset) throws UnsupportedCharsetException {
if (charset != null) {
if (Charset.isSupported(charset)) {
Modified: camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java (original)
+++ camel/trunk/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormat.java Mon Jan 23 20:08:41 2012
@@ -82,8 +82,7 @@ public class PGPDataFormat implements Da
try {
encOut.write(compressedData);
} finally {
- IOHelper.close(encOut);
- IOHelper.close(outputStream);
+ IOHelper.close(encOut, outputStream);
}
}
Modified: camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java (original)
+++ camel/trunk/components/camel-hdfs/src/main/java/org/apache/camel/component/hdfs/HdfsFileType.java Mon Jan 23 20:08:41 2012
@@ -509,8 +509,7 @@ public enum HdfsFileType {
}
} finally {
if (close) {
- IOHelper.close(out);
- IOHelper.close(in);
+ IOHelper.close(out, in);
}
}
return numBytes;
Modified: camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java (original)
+++ camel/trunk/components/camel-http/src/main/java/org/apache/camel/component/http/DefaultHttpBinding.java Mon Jan 23 20:08:41 2012
@@ -318,8 +318,7 @@ public class DefaultHttpBinding implemen
// copy directly from input stream to output stream
IOHelper.copy(is, os);
} finally {
- IOHelper.close(os);
- IOHelper.close(is);
+ IOHelper.close(os, is);
}
} else {
// not convertable as a stream so try as a String
Modified: camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java (original)
+++ camel/trunk/components/camel-http4/src/main/java/org/apache/camel/component/http4/DefaultHttpBinding.java Mon Jan 23 20:08:41 2012
@@ -301,8 +301,7 @@ public class DefaultHttpBinding implemen
// copy directly from input stream to output stream
IOHelper.copy(is, os);
} finally {
- IOHelper.close(os);
- IOHelper.close(is);
+ IOHelper.close(os, is);
}
} else {
// not convertable as a stream so try as a String
Modified: camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java (original)
+++ camel/trunk/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsBlobStoreHelper.java Mon Jan 23 20:08:41 2012
@@ -58,8 +58,7 @@ public final class JcloudsBlobStoreHelpe
} catch (IOException e) {
LOG.error("Error while writing blob", e);
} finally {
- IOHelper.close(oos);
- IOHelper.close(baos);
+ IOHelper.close(oos, baos);
}
}
@@ -98,8 +97,7 @@ public final class JcloudsBlobStoreHelpe
e) {
e.printStackTrace();
} finally {
- IOHelper.close(ois);
- IOHelper.close(is);
+ IOHelper.close(ois, is);
}
return result;
}
Modified: camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java (original)
+++ camel/trunk/components/camel-krati/src/main/java/org/apache/camel/component/krati/serializer/KratiDefaultSerializer.java Mon Jan 23 20:08:41 2012
@@ -56,8 +56,7 @@ public class KratiDefaultSerializer<T ex
} catch (IOException e) {
LOG.warn("Error while serializing object. Null will be used.", e);
} finally {
- IOHelper.close(oos);
- IOHelper.close(baos);
+ IOHelper.close(oos, baos);
}
return result;
}
@@ -97,8 +96,7 @@ public class KratiDefaultSerializer<T ex
} catch (ClassNotFoundException e) {
LOG.warn("Could not find class while deserializing object. Null will be used.", e);
} finally {
- IOHelper.close(ois);
- IOHelper.close(bais);
+ IOHelper.close(ois, bais);
}
return result;
}
Modified: camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java?rev=1234966&r1=1234965&r2=1234966&view=diff
==============================================================================
--- camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java (original)
+++ camel/trunk/components/camel-test-blueprint/src/main/java/org/apache/camel/test/blueprint/CamelBlueprintTestSupport.java Mon Jan 23 20:08:41 2012
@@ -237,8 +237,7 @@ public abstract class CamelBlueprintTest
headers.put(entry.getKey().toString(), entry.getValue().toString());
}
- IOHelper.close(fis);
- IOHelper.close(jis);
+ IOHelper.close(fis, jis);
return new BundleDescriptor(
getClass().getClassLoader(),