Index: hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.java (revision 1561589) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/SecureProtobufLogReader.java (working copy) @@ -114,11 +114,15 @@ @Override protected void initAfterCompression() throws IOException { - WALCellCodec codec = SecureWALCellCodec.getCodec(this.conf, decryptor); - this.cellDecoder = codec.getDecoder(this.inputStream); - // We do not support compression - this.compressionContext = null; - this.hasCompression = false; + if (decryptor != null) { + WALCellCodec codec = SecureWALCellCodec.getCodec(this.conf, decryptor); + this.cellDecoder = codec.getDecoder(this.inputStream); + // We do not support compression with WAL encryption + this.compressionContext = null; + this.hasCompression = false; + } else { + super.initAfterCompression(); + } } }