diff --git a/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java b/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java index c4afa0a..a38d904 100644 --- a/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java +++ b/beeline/src/java/org/apache/hive/beeline/DatabaseConnection.java @@ -127,13 +127,17 @@ boolean connect() throws SQLException { } Map hiveVars = beeLine.getOpts().getHiveVariables(); - for (Map.Entry var : hiveVars.entrySet()) { - info.put(HIVE_VAR_PREFIX + var.getKey(), var.getValue()); + if (hiveVars != null){ + for (Map.Entry var : hiveVars.entrySet()) { + info.put(HIVE_VAR_PREFIX + var.getKey(), var.getValue()); + } } Map hiveConfVars = beeLine.getOpts().getHiveConfVariables(); - for (Map.Entry var : hiveConfVars.entrySet()) { - info.put(HIVE_CONF_PREFIX + var.getKey(), var.getValue()); + if (hiveConfVars != null){ + for (Map.Entry var : hiveConfVars.entrySet()) { + info.put(HIVE_CONF_PREFIX + var.getKey(), var.getValue()); + } } if (isDriverRegistered) {