Repository: nifi Updated Branches: refs/heads/0.x 9eddf12a7 -> 3e6f1f835
NIFI-1746 avoid exceptions if configuration dir is a symbolic link Signed-off-by: Joe Skora <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3e6f1f83 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3e6f1f83 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3e6f1f83 Branch: refs/heads/0.x Commit: 3e6f1f835ac5f0184188dabfaf726d557d095c77 Parents: 9eddf12 Author: Mike Moser <[email protected]> Authored: Fri Apr 8 17:09:24 2016 -0400 Committer: Joe Skora <[email protected]> Committed: Mon Apr 11 02:21:47 2016 -0400 ---------------------------------------------------------------------- .../nifi/persistence/StandardXMLFlowConfigurationDAO.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/3e6f1f83/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java index b93ae8a..b3a6090 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/persistence/StandardXMLFlowConfigurationDAO.java @@ -53,7 +53,10 @@ public final class StandardXMLFlowConfigurationDAO implements FlowConfigurationD public StandardXMLFlowConfigurationDAO(final Path flowXml, final StringEncryptor encryptor) throws IOException { final File flowXmlFile = flowXml.toFile(); if (!flowXmlFile.exists()) { - Files.createDirectories(flowXml.getParent()); + // createDirectories would throw an exception if the directory exists but is a symbolic link + if (Files.notExists(flowXml.getParent())) { + Files.createDirectories(flowXml.getParent()); + } Files.createFile(flowXml); //TODO: find a better solution. With Windows 7 and Java 7, Files.isWritable(source.getParent()) returns false, even when it should be true. } else if (!flowXmlFile.canRead() || !flowXmlFile.canWrite()) {
