Rebase fix

apache · Mar 6, 2025 · 927544e · 927544e
1 parent 8a25f52
commit 927544e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/extensions/python/PythonCreator.h b/extensions/python/PythonCreator.h
@@ -124,7 +124,7 @@ class PythonCreator : public minifi::core::CoreComponentImpl {
         factory = std::make_unique<PythonObjectFactory>(path.string(), script_name.string(),
           PythonProcessorType::MINIFI_TYPE, std::vector<std::filesystem::path>{python_lib_path, std::filesystem::path{pathListings.value()}}, qualified_module_name);
       }
-      if (!registered_classes_.emplace(class_name, factory.get()).second) {
+      if (registered_classes_.emplace(class_name, factory.get()).second) {
         core::getClassLoader().registerClass(class_name, std::move(factory));
       } else {
         logger_->log_warn("Ignoring duplicate python processor at '{}' with class '{}'", path.string(), class_name);

diff --git a/libminifi/src/Funnel.cpp b/libminifi/src/Funnel.cpp
@@ -16,11 +16,12 @@
  */
 
 #include "Funnel.h"
+#include "minifi-cpp/core/ProcessContext.h"
 
 namespace org::apache::nifi::minifi {
 
-void Funnel::onSchedule(core::ProcessContext&, core::ProcessSessionFactory&) {
-  addAutoTerminatedRelationship(Success);
+void Funnel::onSchedule(core::ProcessContext& context, core::ProcessSessionFactory&) {
+  context.addAutoTerminatedRelationship(Success);
 }
 
 }  // namespace org::apache::nifi::minifi