(nifi) branch main updated: NIFI-14188 Fixed NPE in FrameworkSslContextProvider This closes #9659

[joewitt]

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

joewitt 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 9547642299 NIFI-14188 Fixed NPE in FrameworkSslContextProvider This 
closes #9659
9547642299 is described below

commit 95476422990b24586e391ae3599b8cff7db70bb1
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Wed Jan 22 20:18:39 2025 -0600

    NIFI-14188 Fixed NPE in FrameworkSslContextProvider
    This closes #9659
    
    - Returned default empty string to avoid comparing null values for 
keystoreType or truststoreType
    
    Signed-off-by: Joseph Witt <joew...@apache.org>
---
 .../java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
index 58b601ec09..21282b567a 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/ssl/FrameworkSslContextProvider.java
@@ -150,7 +150,7 @@ public class FrameworkSslContextProvider {
     }
 
     private boolean isPemStoreType(final String storeTypePropertyName) {
-        final String storeType = properties.getProperty(storeTypePropertyName);
+        final String storeType = properties.getProperty(storeTypePropertyName, 
EMPTY);
         return PEM_STORE_TYPE.contentEquals(storeType);
     }
 }