You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by la...@apache.org on 2013/07/11 10:59:37 UTC
svn commit: r1502159 -
/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
Author: larsgeorge
Date: Thu Jul 11 08:59:36 2013
New Revision: 1502159
URL: http://svn.apache.org/r1502159
Log:
HBASE-8695 The HBase thrift service ignores XML configuration
Modified:
hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
Modified: hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java?rev=1502159&r1=1502158&r2=1502159&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java (original)
+++ hbase/branches/0.95/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftServer.java Thu Jul 11 08:59:36 2013
@@ -197,10 +197,12 @@ public class ThriftServer {
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));