You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by js...@apache.org on 2016/04/11 08:16:04 UTC
[2/2] nifi git commit: NIFI-1746 avoid exceptions if configuration
dir is a symbolic link
NIFI-1746 avoid exceptions if configuration dir is a symbolic link
Signed-off-by: Joe Skora <js...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/5625686e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/5625686e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/5625686e
Branch: refs/heads/master
Commit: 5625686ea4abdd38cc168607157ac34622e7b105
Parents: 696a12e
Author: Mike Moser <mo...@apache.org>
Authored: Fri Apr 8 17:09:24 2016 -0400
Committer: Joe Skora <js...@gmail.com>
Committed: Mon Apr 11 02:05:48 2016 -0400
----------------------------------------------------------------------
.../nifi/persistence/StandardXMLFlowConfigurationDAO.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/5625686e/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()) {