[nifi-minifi-cpp] branch master updated: MINIFICPP-1003 - persisting properties should leave env vars in config file intact

[ph...@apache.org]

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

phrocker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 4ca2e5a  MINIFICPP-1003 - persisting properties should leave env vars in config file intact
     new 45e30dc  Merge pull request #628 from arpadboda/MINIFICPP-1003
4ca2e5a is described below

commit 4ca2e5af73afbc56b067ec33f874183f6bde07cd
Author: Arpad Boda <ab...@apache.org>
AuthorDate: Thu Aug 15 18:05:30 2019 +0200

    MINIFICPP-1003 - persisting properties should leave env vars in config file intact
---
 libminifi/src/Properties.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/libminifi/src/Properties.cpp b/libminifi/src/Properties.cpp
index 95cb18e..7dad4e6 100644
--- a/libminifi/src/Properties.cpp
+++ b/libminifi/src/Properties.cpp
@@ -223,13 +223,11 @@ bool Properties::persistProperties() {
       continue;
     }
 
-    std::string value = equal;
-    value = org::apache::nifi::minifi::utils::StringUtils::replaceEnvironmentVariables(value);
     key = org::apache::nifi::minifi::utils::StringUtils::trimRight(key);
-    value = org::apache::nifi::minifi::utils::StringUtils::trimRight(value);
+    std::string value = org::apache::nifi::minifi::utils::StringUtils::trimRight(equal);
     auto hasIt = properties_copy.find(key);
     if (hasIt != properties_copy.end() && !value.empty()) {
-      output_file << key << "=" << hasIt->second << std::endl;
+      output_file << key << "=" << value << std::endl;
     }
     properties_copy.erase(key);
   }