From 5fdc21e6b89fde77a8614eecb691ab27ae93e956 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 11 Jun 2018 07:03:14 +0200 Subject: [PATCH] Revert changes breaking illegal character unit tests --- org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java index 85c2bcfd0..f1065be40 100644 --- a/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java +++ b/org.argeo.jcr/src/org/argeo/jcr/fs/JcrFileSystemProvider.java @@ -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); -- 2.30.2