Index: hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java =================================================================== --- hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (revision 1500605) +++ hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (working copy) @@ -197,10 +197,12 @@ conf, TBoundedThreadPoolServer.THREAD_KEEP_ALIVE_TIME_SEC_CONF_KEY); // Set general thrift server options - conf.setBoolean( - ThriftServerRunner.COMPACT_CONF_KEY, cmd.hasOption(COMPACT_OPTION)); - conf.setBoolean( - ThriftServerRunner.FRAMED_CONF_KEY, cmd.hasOption(FRAMED_OPTION)); + boolean compact = cmd.hasOption(COMPACT_OPTION) || + conf.getBoolean(ThriftServerRunner.COMPACT_CONF_KEY, false); + conf.setBoolean(ThriftServerRunner.COMPACT_CONF_KEY, compact); + boolean framed = cmd.hasOption(FRAMED_OPTION) || + conf.getBoolean(ThriftServerRunner.FRAMED_CONF_KEY, false); + conf.setBoolean(ThriftServerRunner.FRAMED_CONF_KEY, framed); if (cmd.hasOption(BIND_OPTION)) { conf.set( ThriftServerRunner.BIND_CONF_KEY, cmd.getOptionValue(BIND_OPTION));