Repository: ranger Updated Branches: refs/heads/master 9260e0de0 -> 445381594
RANGER-1916:Remove duplicate code and optimize code in AtlasClient.class Signed-off-by: peng.jianhua <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/44538159 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/44538159 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/44538159 Branch: refs/heads/master Commit: 44538159464b1357ed6862c5462ae7a4d48a0b8b Parents: 9260e0d Author: peng.jianhua <[email protected]> Authored: Wed Dec 6 15:47:26 2017 +0800 Committer: peng.jianhua <[email protected]> Committed: Thu Dec 7 09:47:25 2017 +0800 ---------------------------------------------------------------------- .../ranger/services/atlas/client/AtlasClient.java | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/44538159/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java ---------------------------------------------------------------------- diff --git a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java index 857df87..ea05ad0 100644 --- a/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java +++ b/plugin-atlas/src/main/java/org/apache/ranger/services/atlas/client/AtlasClient.java @@ -259,9 +259,6 @@ public class AtlasClient extends BaseClient { if (resultResponse != null) { resultResponse.close(); } - if (client != null) { - client.destroy(); - } } return lret; } @@ -327,9 +324,6 @@ public class AtlasClient extends BaseClient { if (resultResponse != null) { resultResponse.close(); } - if (client != null) { - client.destroy(); - } } return lret; } @@ -615,8 +609,8 @@ public class AtlasClient extends BaseClient { String errMsg = errMessage; boolean connectivityStatus = false; HashMap<String, Object> responseData = new HashMap<String, Object>(); - AtlasClient AtlasClient = getAtlasClient(serviceName, configs); - List<String> strList = getAtlasResource(AtlasClient, "", "", null); + AtlasClient atlasClient = getAtlasClient(serviceName, configs); + List<String> strList = getAtlasResource(atlasClient, "", "", null); if (strList != null && strList.size() > 0) { if (LOG.isDebugEnabled()) { @@ -636,7 +630,7 @@ public class AtlasClient extends BaseClient { } public static AtlasClient getAtlasClient(String serviceName, Map<String, String> configs) { - AtlasClient AtlasClient = null; + AtlasClient atlasClient = null; if (LOG.isDebugEnabled()) { LOG.debug("Getting AtlasClient for datasource: " + serviceName); } @@ -648,9 +642,9 @@ public class AtlasClient extends BaseClient { hdpException.generateResponseDataMap(false, msgDesc, msgDesc + errMsg, null, null); throw hdpException; } else { - AtlasClient = new AtlasClient(serviceName, configs); + atlasClient = new AtlasClient(serviceName, configs); } - return AtlasClient; + return atlasClient; } public static List<String> getAtlasResource(final AtlasClient atlasClient, String atlasResourceName,
