CAMEL-9238: Fixed potential NPE in file rename when using move/moveFailed.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0bfb0da5 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0bfb0da5 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0bfb0da5 Branch: refs/heads/camel-2.16.x Commit: 0bfb0da5625a1b88a654cc82861fd08b99195a85 Parents: a8ecbd9 Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Oct 27 11:52:30 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Oct 27 12:38:14 2015 +0100 ---------------------------------------------------------------------- .../camel/component/file/GenericFile.java | 2 +- .../file/FileMoveAndMoveFailedIssueTest.java | 63 ++++++++++++++++++++ 2 files changed, 64 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/0bfb0da5/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java index 907de21..e517550 100644 --- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java +++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java @@ -185,7 +185,7 @@ public class GenericFile<T> implements WrappedFile<T> { // Make sure the names is normalized. String newFileName = FileUtil.normalizePath(newName); - String newEndpointPath = FileUtil.normalizePath(endpointPath); + String newEndpointPath = FileUtil.normalizePath(endpointPath.endsWith("" + File.separatorChar) ? endpointPath : endpointPath + File.separatorChar); LOG.trace("Normalized endpointPath: {}", newEndpointPath); LOG.trace("Normalized newFileName: ()", newFileName); http://git-wip-us.apache.org/repos/asf/camel/blob/0bfb0da5/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java ---------------------------------------------------------------------- diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java new file mode 100644 index 0000000..a9d8ece --- /dev/null +++ b/camel-core/src/test/java/org/apache/camel/component/file/FileMoveAndMoveFailedIssueTest.java @@ -0,0 +1,63 @@ +/** + * 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; + +public class FileMoveAndMoveFailedIssueTest extends ContextTestSupport { + + @Override + protected void setUp() throws Exception { + deleteDirectory("target/input"); + super.setUp(); + } + + public void testMove() throws Exception { + getMockEndpoint("mock:result").expectedMessageCount(1); + getMockEndpoint("mock:result").expectedFileExists("target/input/target/input.bak/somedate/hello.txt"); + + template.sendBodyAndHeader("file:target/input", "Hello World", Exchange.FILE_NAME, "hello.txt"); + + assertMockEndpointsSatisfied(); + } + + public void testMoveFailed() throws Exception { + getMockEndpoint("mock:result").expectedMessageCount(0); + getMockEndpoint("mock:result").expectedFileExists("target/input/target/input.err/somedate/bomb.txt"); + + template.sendBodyAndHeader("file:target/input", "Kaboom", Exchange.FILE_NAME, "bomb.txt"); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("file:./target/input?move=${file:parent}.bak/somedate/${file:onlyname}&moveFailed=${file:parent}.err/somedate/${file:onlyname}") + .convertBodyTo(String.class) + .filter(body().contains("Kaboom")) + .throwException(new IllegalArgumentException("Forced")) + .end() + .to("mock:result"); + } + }; + } +}
