[nifi] branch main updated: NIFI-7832 Resetting boolean that indicates password is being used when service is disabled (#4543)

[alopresto]

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

alopresto 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 caf7960  NIFI-7832 Resetting boolean that indicates password is being 
used when service is disabled (#4543)
caf7960 is described below

commit caf79601ac54249cd61cf7b69112257764d4cb3f
Author: Bryan Bende <bbe...@apache.org>
AuthorDate: Tue Sep 22 12:11:46 2020 -0400

    NIFI-7832 Resetting boolean that indicates password is being used when 
service is disabled (#4543)
    
    Signed-off-by: Andy LoPresto <alopre...@apache.org>
---
 .../nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java      | 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
 
b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
index 317c5e6..f48f250 100644
--- 
a/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
+++ 
b/nifi-nar-bundles/nifi-standard-services/nifi-hwx-schema-registry-bundle/nifi-hwx-schema-registry-service/src/main/java/org/apache/nifi/schemaregistry/hortonworks/HortonworksSchemaRegistry.java
@@ -222,6 +222,7 @@ public class HortonworksSchemaRegistry extends 
AbstractControllerService impleme
             final String keytab = kerberosCredentialsService.getKeytab();
             final String jaasConfigString = getKeytabJaasConfig(principal, 
keytab);
             
schemaRegistryConfig.put(SchemaRegistryClient.Configuration.SASL_JAAS_CONFIG.name(),
 jaasConfigString);
+            usingKerberosWithPassword = false;
         } else if (!StringUtils.isBlank(kerberosPrincipal) && 
!StringUtils.isBlank(kerberosPassword)) {
             
schemaRegistryConfig.put(SchemaRegistryClientWithKerberosPassword.SCHEMA_REGISTRY_CLIENT_KERBEROS_PRINCIPAL,
 kerberosPrincipal);
             
schemaRegistryConfig.put(SchemaRegistryClientWithKerberosPassword.SCHEMA_REGISTRY_CLIENT_KERBEROS_PASSWORD,
 kerberosPassword);
@@ -268,6 +269,7 @@ public class HortonworksSchemaRegistry extends 
AbstractControllerService impleme
         }
 
         initialized = false;
+        usingKerberosWithPassword = false;
     }