diff Hive.Java ../old/Hive.java 2576,2577c2576 < HadoopShims.HdfsEncryptionShim srcShim = SessionState.get().getHdfsEncryptionShimForPath(srcf); < HadoopShims.HdfsEncryptionShim destShim = SessionState.get().getHdfsEncryptionShimForPath(destf); --- > HadoopShims.HdfsEncryptionShim hdfsEncryptionShim = SessionState.get().getHdfsEncryptionShim(); 2608,2611c2607,2608 < if (srcShim != null < && (srcShim.isPathEncrypted(srcf) < || destShim.isPathEncrypted(destf)) < && !srcShim.arePathsOnSameEncryptionZone(srcf, destf)) --- > if (hdfsEncryptionShim != null && (hdfsEncryptionShim.isPathEncrypted(srcf) || hdfsEncryptionShim.isPathEncrypted(destf)) > && !hdfsEncryptionShim.arePathsOnSameEncryptionZone(srcf, destf)) diff SemanticAnalyzer.java ../old/SemanticAnalyzer.java 1906c1906 < hdfsEncryptionShim = SessionState.get().getHdfsEncryptionShimForPath(p1); --- > hdfsEncryptionShim = SessionState.get().getHdfsEncryptionShim();