fgerlits commented on a change in pull request #940: URL: https://github.com/apache/nifi-minifi-cpp/pull/940#discussion_r576623105
########## File path: libminifi/test/TestBase.cpp ########## @@ -62,78 +63,51 @@ TestPlan::~TestPlan() { for (auto& processor : configured_processors_) { processor->setScheduledState(core::ScheduledState::STOPPED); } + for (auto& connection : relationships_) { + // This is a patch solving circular references between processors and connections + connection->setSource(nullptr); + connection->setDestination(nullptr); + } controller_services_provider_->clearControllerServices(); } std::shared_ptr<core::Processor> TestPlan::addProcessor(const std::shared_ptr<core::Processor> &processor, const std::string &name, const std::initializer_list<core::Relationship>& relationships, - bool linkToPrevious) { + bool linkToPrevious) { if (finalized) { return nullptr; } std::lock_guard<std::recursive_mutex> guard(mutex); - utils::Identifier uuid = utils::IdGenerator::getIdGenerator()->generate(); - processor->setStreamFactory(stream_factory); // initialize the processor processor->initialize(); processor->setFlowIdentifier(flow_version_->getFlowIdentifier()); - processor_mapping_[processor->getUUID()] = processor; - if (!linkToPrevious) { termination_ = *(relationships.begin()); } else { std::shared_ptr<core::Processor> last = processor_queue_.back(); - if (last == nullptr) { last = processor; termination_ = *(relationships.begin()); } - - std::stringstream connection_name; - connection_name << last->getUUIDStr() << "-to-" << processor->getUUIDStr(); - logger_->log_info("Creating %s connection for proc %d", connection_name.str(), processor_queue_.size() + 1); - std::shared_ptr<minifi::Connection> connection = std::make_shared<minifi::Connection>(flow_repo_, content_repo_, connection_name.str()); - for (const auto& relationship : relationships) { - connection->addRelationship(relationship); - } - - // link the connections so that we can test results at the end for this - connection->setSource(last); - connection->setDestination(processor); - - connection->setSourceUUID(last->getUUID()); - connection->setDestinationUUID(processor->getUUID()); - last->addConnection(connection); - if (last != processor) { - processor->addConnection(connection); + addConnection(last, relationship, processor); Review comment: This change was reverted in https://github.com/apache/nifi-minifi-cpp/pull/940/commits/33e84f4f31b803a0cf0f212287c701d922295059. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org