Repository: incubator-atlas Updated Branches: refs/heads/master d813519fd -> 155554e66
ATLAS-29 create configuration that inherits existing hadoop config Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/155554e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/155554e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/155554e6 Branch: refs/heads/master Commit: 155554e66600cf6d7598c30bf7051e4c5946f529 Parents: d813519 Author: Jon Maron <[email protected]> Authored: Thu Jun 18 14:06:36 2015 -0400 Committer: Jon Maron <[email protected]> Committed: Thu Jun 18 14:06:36 2015 -0400 ---------------------------------------------------------------------- .../main/java/org/apache/atlas/security/SecureClientUtils.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/155554e6/client/src/main/java/org/apache/atlas/security/SecureClientUtils.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/atlas/security/SecureClientUtils.java b/client/src/main/java/org/apache/atlas/security/SecureClientUtils.java index 9d5641a..e3b71d5 100644 --- a/client/src/main/java/org/apache/atlas/security/SecureClientUtils.java +++ b/client/src/main/java/org/apache/atlas/security/SecureClientUtils.java @@ -63,14 +63,14 @@ public class SecureClientUtils { public static URLConnectionClientHandler getClientConnectionHandler(DefaultClientConfig config, PropertiesConfiguration clientConfig) { config.getProperties().put(URLConnectionClientHandler.PROPERTY_HTTP_URL_CONNECTION_SET_METHOD_WORKAROUND, true); - Configuration conf = new Configuration(false); + Configuration conf = new Configuration(); conf.addResource(conf.get(SSLFactory.SSL_CLIENT_CONF_KEY, "ssl-client.xml")); + UserGroupInformation.setConfiguration(conf); + final ConnectionConfigurator connConfigurator = newConnConfigurator(conf); String authType = "simple"; if (clientConfig != null) { authType = clientConfig.getString("atlas.http.authentication.type", "simple"); } - UserGroupInformation.setConfiguration(conf); - final ConnectionConfigurator connConfigurator = newConnConfigurator(conf); Authenticator authenticator = new PseudoDelegationTokenAuthenticator(); if (!authType.equals("simple")) { authenticator = new KerberosDelegationTokenAuthenticator();
