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

pvillard 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 6dee8dfae5 NIFI-14199 Fixed Potential NPE in SslContextConfiguration
6dee8dfae5 is described below

commit 6dee8dfae5a177bea06e2b71b8f303b462e8ac32
Author: exceptionfactory <[email protected]>
AuthorDate: Sat Feb 8 12:53:36 2025 -0600

    NIFI-14199 Fixed Potential NPE in SslContextConfiguration
    
    - Handled null value for keystoreType or truststoreType
    
    Signed-off-by: Pierre Villard <[email protected]>
    
    This closes #9704.
---
 .../apache/nifi/framework/configuration/SslContextConfiguration.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/configuration/SslContextConfiguration.java
 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/SslContextConfiguration.java
index 77fb4a0778..bb6905f1ca 100644
--- 
a/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/SslContextConfiguration.java
+++ 
b/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/framework/configuration/SslContextConfiguration.java
@@ -338,7 +338,7 @@ public class SslContextConfiguration {
     }
 
     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);
     }
 }

Reply via email to