Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DAC9F200B52 for ; Mon, 25 Jul 2016 23:24:42 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id D94DD160A7D; Mon, 25 Jul 2016 21:24:42 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 2D100160A67 for ; Mon, 25 Jul 2016 23:24:42 +0200 (CEST) Received: (qmail 76593 invoked by uid 500); 25 Jul 2016 21:24:41 -0000 Mailing-List: contact commits-help@atlas.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@atlas.incubator.apache.org Delivered-To: mailing list commits@atlas.incubator.apache.org Received: (qmail 76584 invoked by uid 99); 25 Jul 2016 21:24:41 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jul 2016 21:24:41 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id D9541C0362 for ; Mon, 25 Jul 2016 21:24:40 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.646 X-Spam-Level: X-Spam-Status: No, score=-4.646 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.426] autolearn=disabled Received: from mx1-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Axv_lbEbmN-B for ; Mon, 25 Jul 2016 21:24:39 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-eu.apache.org (ASF Mail Server at mx1-lw-eu.apache.org) with SMTP id E5D585F341 for ; Mon, 25 Jul 2016 21:24:38 +0000 (UTC) Received: (qmail 76568 invoked by uid 99); 25 Jul 2016 21:24:38 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 25 Jul 2016 21:24:38 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F2E42E00A7; Mon, 25 Jul 2016 21:24:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sumasai@apache.org To: commits@atlas.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-atlas git commit: ATLAS-1052 Fix NPE in HiveHook due to null Session State (sumasai) Date: Mon, 25 Jul 2016 21:24:37 +0000 (UTC) archived-at: Mon, 25 Jul 2016 21:24:43 -0000 Repository: incubator-atlas Updated Branches: refs/heads/master 46ec799cc -> 56e97e225 ATLAS-1052 Fix NPE in HiveHook due to null Session State (sumasai) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/56e97e22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/56e97e22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/56e97e22 Branch: refs/heads/master Commit: 56e97e225e65b50d15e6f59211f796788dd97446 Parents: 46ec799 Author: Suma Shivaprasad Authored: Mon Jul 25 14:24:26 2016 -0700 Committer: Suma Shivaprasad Committed: Mon Jul 25 14:24:26 2016 -0700 ---------------------------------------------------------------------- .../java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java | 2 +- release-log.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/56e97e22/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java index 3d3aef2..fcc45ab 100755 --- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java +++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java @@ -362,7 +362,7 @@ public class HiveMetaStoreBridge { public static String getTableQualifiedName(String clusterName, String dbName, String tableName, boolean isTemporaryTable) { String tableTempName = tableName; if (isTemporaryTable) { - if (SessionState.get().getSessionId() != null) { + if (SessionState.get() != null && SessionState.get().getSessionId() != null) { tableTempName = tableName + TEMP_TABLE_PREFIX + SessionState.get().getSessionId(); } else { tableTempName = tableName + TEMP_TABLE_PREFIX + RandomStringUtils.random(10); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/56e97e22/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index c5e23f1..334a1c5 100644 --- a/release-log.txt +++ b/release-log.txt @@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ALL CHANGES: +ATLAS-1052 Fix NPE in HiveHook due to null Session State (sumasai) ATLAS-1051 Sqoop Hook does not package HDFS model jars which is required (sumasai) ATLAS-1049 List types by supertype (shwethags via sumasai) ATLAS-1032 Atlas hook package should not include libraries already present in host component - like log4j(mneethiraj via sumasai)