Update the code to comply with my hadoop-2 patch.