[nifi] branch master updated: NIFI-6215: Ensure that when we are swapping FlowFiles back into nifi, that we consider forward slashes or back slashes as the same path separator when determining filename

[mattyb149]

This is an automated email from the ASF dual-hosted git repository.

mattyb149 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/master by this push:
     new 7b94518  NIFI-6215: Ensure that when we are swapping FlowFiles back 
into nifi, that we consider forward slashes or back slashes as the same path 
separator when determining filename
7b94518 is described below

commit 7b945182af250f3cb820f1d6fdc35bd31d21ba29
Author: Mark Payne <marka...@hotmail.com>
AuthorDate: Mon Apr 15 15:24:15 2019 -0400

    NIFI-6215: Ensure that when we are swapping FlowFiles back into nifi, that 
we consider forward slashes or back slashes as the same path separator when 
determining filename
    
    Signed-off-by: Matthew Burgess <mattyb...@apache.org>
    
    This closes #3434
---
 .../nifi/controller/repository/WriteAheadFlowFileRepository.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
index fdde18c..05dbf88 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/repository/WriteAheadFlowFileRepository.java
@@ -420,7 +420,8 @@ public class WriteAheadFlowFileRepository implements 
FlowFileRepository, SyncLis
             return null;
         }
 
-        final String withoutTrailing = (swapLocation.endsWith("/") && 
swapLocation.length() > 1) ? swapLocation.substring(0, swapLocation.length() - 
1) : swapLocation;
+        final String normalizedPath = swapLocation.replace("\\", "/");
+        final String withoutTrailing = (normalizedPath.endsWith("/") && 
normalizedPath.length() > 1) ? normalizedPath.substring(0, 
normalizedPath.length() - 1) : normalizedPath;
         final int lastIndex = withoutTrailing.lastIndexOf("/");
         if (lastIndex < 0 || lastIndex >= withoutTrailing.length() - 1) {
             return withoutTrailing;