Repository: nifi
Updated Branches:
  refs/heads/master 487f05a2b -> 6331dda8d


NIFI-2643 Changed null check to !isBlank() for key in RunNiFi.

NIFI-2643 Updated comment in bootstrap.conf template.

This closes #932


Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/6331dda8
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/6331dda8
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/6331dda8

Branch: refs/heads/master
Commit: 6331dda8d3c3fd195551f23479069864845cd6bd
Parents: 487f05a
Author: Andy LoPresto <alopre...@apache.org>
Authored: Wed Aug 24 12:17:14 2016 -0700
Committer: Oleg Zhurakousky <o...@suitcase.io>
Committed: Wed Aug 24 16:20:10 2016 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/nifi/bootstrap/RunNiFi.java           | 2 +-
 .../nifi-resources/src/main/resources/conf/bootstrap.conf          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi/blob/6331dda8/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
----------------------------------------------------------------------
diff --git 
a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java 
b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
index eb3d8ec..04e7ba3 100644
--- a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
+++ b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
@@ -1021,7 +1021,7 @@ public class RunNiFi {
         cmd.add("-Dapp=NiFi");
         cmd.add("-Dorg.apache.nifi.bootstrap.config.log.dir=" + nifiLogDir);
         cmd.add("org.apache.nifi.NiFi");
-        if (props.containsKey(NIFI_BOOTSTRAP_SENSITIVE_KEY) && 
props.get(NIFI_BOOTSTRAP_SENSITIVE_KEY) != null) {
+        if (props.containsKey(NIFI_BOOTSTRAP_SENSITIVE_KEY) && 
!StringUtils.isBlank(props.get(NIFI_BOOTSTRAP_SENSITIVE_KEY))) {
             cmd.add("-k " + props.get(NIFI_BOOTSTRAP_SENSITIVE_KEY));
         }
 

http://git-wip-us.apache.org/repos/asf/nifi/blob/6331dda8/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
----------------------------------------------------------------------
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
index f4a6c29..67c3122 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
@@ -51,7 +51,7 @@ java.arg.13=-XX:+UseG1GC
 #Set headless mode by default
 java.arg.14=-Djava.awt.headless=true
 
-#Set sensitive properties key
+# Master key in hexadecimal format for encrypted sensitive configuration values
 nifi.bootstrap.sensitive.key=
 
 ###

Reply via email to