NPE when MSCK REPAIR

HiveMetaStoreChecker throws NullPointerException when doing a MSCK REPAIR TABLE.

The bug is here:

...
18      package org.apache.hadoop.hive.ql.metadata;
...
58      public class HiveMetaStoreChecker {
...
408        if (!directoryFound) {
409         allDirs.put(path, null);
410        }
...

allDirs is a ConcurrentHashMap and those does not allow either key or value to be null.

I found the bug while trying to port https://github.com/klarna/HiveRunner to Hive 2.1.0

Implemented explicit test case that exposes the bug here:
https://github.com/klarna/HiveRunner/blob/hive-2.1.0-NPE-at-msck-repair/src/test/java/com/klarna/hiverunner/MSCKRepairNPE.java

Reproduce by cloning branch https://github.com/klarna/HiveRunner/tree/hive-2.1.0-NPE-at-msck-repair
and run

 mvn -Dtest=MSCKRepairNPE clean test

( Does not work on windows )

Looks like this email thread talks about the same issue:
http://user.hive.apache.narkive.com/ETOpbKk5/msck-repair-table-and-hive-v2-1-0