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

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git

commit 5afda79f282c99df370edb411234c2182bebe4b9
Author: Nissim Shiman <nshi...@yahoo.com>
AuthorDate: Fri Sep 29 18:57:19 2023 +0000

    NIFI-11782 Resolved NPE when moving snippet with label to process group
    
    This closes #7838
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../src/main/java/org/apache/nifi/audit/SnippetAuditor.java           | 4 ++++
 .../nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml | 1 +
 2 files changed, 5 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
index 63544a0842..1801567fcc 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/audit/SnippetAuditor.java
@@ -508,6 +508,10 @@ public class SnippetAuditor extends NiFiAuditor {
         this.processorDAO = processorDAO;
     }
 
+    public void setLabelDAO(LabelDAO labelDAO) {
+        this.labelDAO = labelDAO;
+    }
+
     public void setRelationshipAuditor(RelationshipAuditor 
relationshipAuditor) {
         this.relationshipAuditor = relationshipAuditor;
     }
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
index 840c23abcc..2c56e9aeeb 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/resources/nifi-web-api-context.xml
@@ -723,6 +723,7 @@
         <property name="processorDAO" ref="processorDAO"/>
         <property name="funnelDAO" ref="funnelDAO"/>
         <property name="connectionDAO" ref="connectionDAO"/>
+        <property name="labelDAO" ref="labelDAO"/>
         <property name="portAuditor" ref="portAuditor"/>
         <property name="funnelAuditor" ref="funnelAuditor"/>
         <property name="remoteProcessGroupAuditor" 
ref="remoteProcessGroupAuditor"/>

Reply via email to