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 2016/08/18 17:39:01 UTC
nifi git commit: NIFI-2598: This closes #889. Fixed issue with static
init of properties in HiveConnectionPool
Repository: nifi
Updated Branches:
refs/heads/master e0e4b3407 -> a74bc2c7c
NIFI-2598: This closes #889. Fixed issue with static init of properties in HiveConnectionPool
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/a74bc2c7
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/a74bc2c7
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/a74bc2c7
Branch: refs/heads/master
Commit: a74bc2c7c75b05d2dea87d829ab71798121e6175
Parents: e0e4b34
Author: Matt Burgess <ma...@apache.org>
Authored: Thu Aug 18 13:21:15 2016 -0400
Committer: joewitt <jo...@apache.org>
Committed: Thu Aug 18 13:38:22 2016 -0400
----------------------------------------------------------------------
.../apache/nifi/dbcp/hive/HiveConnectionPool.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/a74bc2c7/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
index 9006d41..1784381 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/src/main/java/org/apache/nifi/dbcp/hive/HiveConnectionPool.java
@@ -17,6 +17,7 @@
package org.apache.nifi.dbcp.hive;
import java.io.File;
+
import org.apache.commons.dbcp.BasicDataSource;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.security.UserGroupInformation;
@@ -51,6 +52,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
+
import org.apache.nifi.controller.ControllerServiceInitializationContext;
/**
@@ -122,7 +124,7 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
private static final long TICKET_RENEWAL_PERIOD = 60000;
- private final static List<PropertyDescriptor> properties;
+ private List<PropertyDescriptor> properties;
private String connectionUrl = "unknown";
@@ -136,7 +138,8 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
private volatile File kerberosConfigFile = null;
private volatile KerberosProperties kerberosProperties;
- static {
+ @Override
+ protected void init(final ControllerServiceInitializationContext context) {
List<PropertyDescriptor> props = new ArrayList<>();
props.add(DATABASE_URL);
props.add(HIVE_CONFIGURATION_RESOURCES);
@@ -144,15 +147,12 @@ public class HiveConnectionPool extends AbstractControllerService implements Hiv
props.add(DB_PASSWORD);
props.add(MAX_WAIT_TIME);
props.add(MAX_TOTAL_CONNECTIONS);
- properties = props;
- }
- @Override
- protected void init(final ControllerServiceInitializationContext context) {
kerberosConfigFile = context.getKerberosConfigurationFile();
kerberosProperties = new KerberosProperties(kerberosConfigFile);
- properties.add(kerberosProperties.getKerberosPrincipal());
- properties.add(kerberosProperties.getKerberosKeytab());
+ props.add(kerberosProperties.getKerberosPrincipal());
+ props.add(kerberosProperties.getKerberosKeytab());
+ properties = props;
}
@Override