You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2020/09/22 20:53:31 UTC
[nifi] 05/06: NIFI-7832 Resetting boolean that indicates password
is being used when service is disabled (#4543)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch support/nifi-1.12.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit be3e918ae370b6496711df3697eddd9ce058b12a
Author: Bryan Bende <bb...@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 <al...@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;
}