From 927544edb1ef319428f653b112a9770faab46ee9 Mon Sep 17 00:00:00 2001 From: Adam Debreceni Date: Thu, 6 Mar 2025 12:22:12 +0100 Subject: [PATCH] Rebase fix --- extensions/python/PythonCreator.h | 2 +- libminifi/src/Funnel.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/python/PythonCreator.h b/extensions/python/PythonCreator.h index b326d34dc9..647f3255a6 100644 --- a/extensions/python/PythonCreator.h +++ b/extensions/python/PythonCreator.h @@ -124,7 +124,7 @@ class PythonCreator : public minifi::core::CoreComponentImpl { factory = std::make_unique(path.string(), script_name.string(), PythonProcessorType::MINIFI_TYPE, std::vector{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 index fee7ccf78f..a3ef769f3f 100644 --- 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