Author: davsclaus
Date: Fri Nov 27 13:46:03 2009
New Revision: 884876
URL: http://svn.apache.org/viewvc?rev=884876&view=rev
Log:
CAMEL-2234: Fixed potential issue with copying large files using NIO hitting a
2gb limit.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java?rev=884876&r1=884875&r2=884876&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/FileOperations.java
Fri Nov 27 13:46:03 2009
@@ -222,7 +222,12 @@
if (LOG.isTraceEnabled()) {
LOG.trace("Using FileChannel to transfer from: " + in + " to:
" + out);
}
- in.transferTo(0, in.size(), out);
+
+ long size = in.size();
+ long position = 0;
+ while (position < size) {
+ position += in.transferTo(position, endpoint.getBufferSize(),
out);
+ }
} finally {
ObjectHelper.close(in, source.getName(), LOG);
ObjectHelper.close(out, source.getName(), LOG);
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java?rev=884876&r1=884875&r2=884876&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
Fri Nov 27 13:46:03 2009
@@ -385,6 +385,9 @@
}
public void setBufferSize(int bufferSize) {
+ if (bufferSize <= 0) {
+ throw new IllegalArgumentException("BufferSize must be a positive
value, was " + bufferSize);
+ }
this.bufferSize = bufferSize;
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java?rev=884876&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
Fri Nov 27 13:46:03 2009
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision$
+ */
+public class FileToFileNioLowBufferTest extends ContextTestSupport {
+
+ public void testFileToFileNioLowBuffer() throws Exception {
+ deleteDirectory("target/nio");
+
+ String body = "1234567890123456789012345678901234567890";
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.expectedFileExists("target/nio/out/hello.txt", body);
+
+ template.sendBodyAndHeader("file://target/nio/in", body,
Exchange.FILE_NAME, "hello.txt");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+
from("file://target/nio/in").to("file://target/nio/out?bufferSize=4").to("mock:result");
+ }
+ };
+ }
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileToFileNioLowBufferTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
