nifi-commits mailing list archives

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

aldrin 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 5a2e890  MINIFICPP-753: Deprioritize docs and fix the doc dir in the base conf
5a2e890 is described below

commit 5a2e8906697ccb40a6a2f9172e6d58e3316305bd
Author: Marc Parisi <phrocker@apache.org>
AuthorDate: Mon Mar 4 11:44:05 2019 -0500

    MINIFICPP-753: Deprioritize docs and fix the doc dir in the base conf
    
    This closes #497.
    
    Signed-off-by: Aldrin Piri <aldrin@apache.org>
---
 conf/minifi.properties      | 2 +-
 extensions/jni/JVMCreator.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf/minifi.properties b/conf/minifi.properties
index 90bca9a..6d8b681 100644
--- a/conf/minifi.properties
+++ b/conf/minifi.properties
@@ -47,7 +47,7 @@ nifi.database.content.repository.directory.default=${MINIFI_HOME}/content_reposi
 nifi.framework.dir=${MINIFI_HOME}/minifi-jni/lib
 nifi.nar.directory=${MINIFI_HOME}/minifi-jni/nars
 nifi.nar.deploy.directory=${MINIFI_HOME}/minifi-jni/nardeploy
-nifi.nar.deploy.directory=${MINIFI_HOME}/minifi-jni/nardocs
+nifi.nar.docs.directory=${MINIFI_HOME}/minifi-jni/nardocs
 # must be comma separated 
 nifi.jvm.options=-Xmx1G
 nifi.python.processor.dir=${MINIFI_HOME}/minifi-python/
\ No newline at end of file
diff --git a/extensions/jni/JVMCreator.h b/extensions/jni/JVMCreator.h
index 8981701..e5346bc 100644
--- a/extensions/jni/JVMCreator.h
+++ b/extensions/jni/JVMCreator.h
@@ -78,7 +78,7 @@ class JVMCreator : public minifi::core::CoreComponent {
       initializeJVM();
     }
     std::string nar_dir, nar_dep, nar_docs;
-    if (loader_ && configuration->get("nifi.nar.directory", nar_dir) &&
configuration->get("nifi.nar.deploy.directory", nar_dep) && configuration->get("nifi.nar.docs.directory",
nar_docs)) {
+    if (loader_ && configuration->get("nifi.nar.directory", nar_dir) &&
configuration->get("nifi.nar.deploy.directory", nar_dep)) {
       std::shared_ptr<jni::controllers::JavaControllerService> servicer = std::make_shared<jni::controllers::JavaControllerService>("BaseService");
       servicer->initialize();
       servicer->setProperty(jni::controllers::JavaControllerService::NarDirectory, nar_dir);