Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

NIFI-2643 Updated comment in bootstrap.conf template.

This closes #932
This commit is contained in:
Andy LoPresto 2016-08-24 12:17:14 -07:00 committed by Oleg Zhurakousky
parent 487f05a2b1
commit 6331dda8d3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/RunNiFi.java
View File

@ -1021,7 +1021,7 @@ public class RunNiFi {
cmd.add("-Dapp=NiFi"); cmd.add("-Dapp=NiFi");
cmd.add("-Dorg.apache.nifi.bootstrap.config.log.dir=" + nifiLogDir); cmd.add("-Dorg.apache.nifi.bootstrap.config.log.dir=" + nifiLogDir);
cmd.add("org.apache.nifi.NiFi"); 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)); cmd.add("-k " + props.get(NIFI_BOOTSTRAP_SENSITIVE_KEY));
} }

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
View File

@ -51,7 +51,7 @@ java.arg.13=-XX:+UseG1GC
#Set headless mode by default #Set headless mode by default
java.arg.14=-Djava.awt.headless=true 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= nifi.bootstrap.sensitive.key=
### ###