Fix after rebase

apache · Nov 18, 2024 · 30fea42 · 30fea42
1 parent efb192f
commit 30fea42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/extensions/couchbase/controllerservices/CouchbaseClusterService.cpp b/extensions/couchbase/controllerservices/CouchbaseClusterService.cpp
@@ -153,7 +153,7 @@ void CouchbaseClusterService::onEnable() {
 gsl::not_null<std::shared_ptr<CouchbaseClusterService>> CouchbaseClusterService::getFromProperty(const core::ProcessContext& context, const core::PropertyReference& property) {
   std::shared_ptr<CouchbaseClusterService> couchbase_cluster_service;
   if (auto connection_controller_name = context.getProperty(property)) {
-    couchbase_cluster_service = std::dynamic_pointer_cast<CouchbaseClusterService>(context.getControllerService(*connection_controller_name));
+    couchbase_cluster_service = std::dynamic_pointer_cast<CouchbaseClusterService>(context.getControllerService(*connection_controller_name, context.getProcessorNode()->getUUID()));
   }
   if (!couchbase_cluster_service) {
     throw minifi::Exception(ExceptionType::PROCESS_SCHEDULE_EXCEPTION, "Missing Couchbase Cluster Service");

diff --git a/extensions/couchbase/tests/PutCouchbaseKeyTests.cpp b/extensions/couchbase/tests/PutCouchbaseKeyTests.cpp
@@ -41,7 +41,9 @@ struct ExpectedCallOptions {
 
 class PutCouchbaseKeyTestController : public TestController {
  public:
-  PutCouchbaseKeyTestController() {
+  PutCouchbaseKeyTestController()
+      : controller_(std::make_unique<processors::PutCouchbaseKey>("PutCouchbaseKey")),
+        proc_(controller_.getProcessor()) {
     LogTestController::getInstance().setDebug<TestPlan>();
     LogTestController::getInstance().setDebug<minifi::core::Processor>();
     LogTestController::getInstance().setTrace<minifi::core::ProcessSession>();
@@ -110,8 +112,8 @@ class PutCouchbaseKeyTestController : public TestController {
   }
 
  protected:
-  std::shared_ptr<core::Processor> proc_ = std::make_shared<processors::PutCouchbaseKey>("PutCouchbaseKey");
-  minifi::test::SingleProcessorTestController controller_{proc_};
+  minifi::test::SingleProcessorTestController controller_;
+  core::Processor* proc_ = nullptr;
   std::shared_ptr<MockCouchbaseClusterService> mock_couchbase_cluster_service_;
 };