(nifi) branch main updated: NIFI-12913 Corrected NPE for Python Log Listener ID

[exceptionfactory]

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


The following commit(s) were added to refs/heads/main by this push:
     new 2303a15f8e NIFI-12913 Corrected NPE for Python Log Listener ID
2303a15f8e is described below

commit 2303a15f8ecf5b5b48764fae3555f33103252ca6
Author: bob <b...@apache.org>
AuthorDate: Sun Mar 17 11:15:14 2024 -0500

    NIFI-12913 Corrected NPE for Python Log Listener ID
    
    This closes #8526
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../src/main/java/org/apache/nifi/py4j/PythonProcess.java             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/py4j/PythonProcess.java
 
b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/py4j/PythonProcess.java
index 3cfb2b30f4..2e4779bfab 100644
--- 
a/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/py4j/PythonProcess.java
+++ 
b/nifi-nar-bundles/nifi-py4j-bundle/nifi-py4j-bridge/src/main/java/org/apache/nifi/py4j/PythonProcess.java
@@ -361,7 +361,9 @@ public class PythonProcess {
     }
 
     private synchronized void killProcess() {
-        
StandardLogLevelChangeHandler.getHandler().removeListener(logListenerId);
+        if (logListenerId != null) {
+            
StandardLogLevelChangeHandler.getHandler().removeListener(logListenerId);
+        }
 
         if (server != null) {
             try {