Revert changes breaking illegal character unit tests
authorMathieu Baudier <mbaudier@argeo.org>
Mon, 11 Jun 2018 05:03:14 +0000 (07:03 +0200)
committerMathieu Baudier <mbaudier@argeo.org>
Mon, 11 Jun 2018 05:03:14 +0000 (07:03 +0200)
org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java

index 85c2bcfd0c7ad5552a2dadc3a492359267e49e38..f1065be40a3ec4ac2dfb035597202ec3ba977962 100644 (file)
@@ -2,7 +2,6 @@ package org.argeo.jcr.fs;
 
 import java.io.IOException;
 import java.nio.channels.SeekableByteChannel;
-import java.nio.charset.Charset;
 import java.nio.file.AccessMode;
 import java.nio.file.CopyOption;
 import java.nio.file.DirectoryNotEmptyException;
@@ -50,6 +49,7 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
                                        throw new IOException(path + " parent is a file");
 
                                String fileName = path.getFileName().toString();
+                               fileName = Text.escapeIllegalJcrChars(fileName);
                                node = parent.addNode(fileName, NodeType.NT_FILE);
                                node.addMixin(NodeType.MIX_CREATED);
                                node.addMixin(NodeType.MIX_LAST_MODIFIED);
@@ -85,6 +85,7 @@ public abstract class JcrFileSystemProvider extends FileSystemProvider {
                                                || parent.getPrimaryNodeType().isNodeType(NodeType.NT_LINKED_FILE))
                                        throw new IOException(dir + " parent is a file");
                                String fileName = dir.getFileName().toString();
+                               fileName = Text.escapeIllegalJcrChars(fileName);
                                node = parent.addNode(fileName, NodeType.NT_FOLDER);
                                node.addMixin(NodeType.MIX_CREATED);
                                node.addMixin(NodeType.MIX_LAST_MODIFIED);