You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by br...@apache.org on 2015/02/16 21:45:29 UTC
svn commit: r1660198 - in /hive/branches/branch-1.1: ./
metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
Author: brock
Date: Mon Feb 16 20:45:29 2015
New Revision: 1660198
URL: http://svn.apache.org/r1660198
Log:
HIVE-9686 - HiveMetastore.logAuditEvent can be used before sasl server is started (Brock via Xuefu)
Modified:
hive/branches/branch-1.1/ (props changed)
hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
Propchange: hive/branches/branch-1.1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 16 20:45:29 2015
@@ -3,4 +3,4 @@
/hive/branches/spark:1608589-1654414,1654553,1654869,1654873,1655427,1655468,1655926-1655927,1656573,1658877,1659840
/hive/branches/tez:1494760-1622766
/hive/branches/vectorization:1466908-1527856
-/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895,1656061,1656114,1656234,1656587,1656780,1657742,1657990,1658221,1658471,1658766,1659027,1659106,1659432,1659434
+/hive/trunk:1655202,1655210,1655213,1655436,1655460,1655894-1655895,1656061,1656114,1656234,1656587,1656780,1657742,1657990,1658221,1658471,1658766,1659027,1659106,1659432,1659434,1659870
Modified: hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java?rev=1660198&r1=1660197&r2=1660198&view=diff
==============================================================================
--- hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java (original)
+++ hive/branches/branch-1.1/metastore/src/java/org/apache/hadoop/hive/metastore/HiveMetaStore.java Mon Feb 16 20:45:29 2015
@@ -343,9 +343,11 @@ public class HiveMetaStore extends Thrif
final Formatter fmt = auditFormatter.get();
((StringBuilder) fmt.out()).setLength(0);
- String address;
+ String address = null;
if (useSasl) {
- address = saslServer.getRemoteAddress().toString();
+ if (saslServer != null && saslServer.getRemoteAddress() != null) {
+ address = String.valueOf(saslServer.getRemoteAddress());
+ }
} else {
address = getIpAddress();
}