Thanks Hanisha Koneru for reporting the issue/posting the patch and Arpit Agarwal for the reviews.
The code change in patch v03 looks good to me. Just a few comments on the unit test:
1. NIT: clusterTestGenerateEDEKTime is too verbose, just cluster is good as it is the only cluster used in the test case.
2. Test cluster may not shutdown when exception happened during the test. This could cause subsequent test failures. You may wrap it with try/final or even better with the new Java try with resources semantics to ensure a test cluster clean up.
3. NIT: There are a few test wrapper (e.g., DFSTestUtil#createFile ) you can use to simplify test file creation below.
4. checkstyle issues.