You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by iv...@apache.org on 2012/05/15 12:28:38 UTC

svn commit: r1338630 - in /zookeeper/bookkeeper/trunk: CHANGES.txt hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java

Author: ivank
Date: Tue May 15 10:28:38 2012
New Revision: 1338630

URL: http://svn.apache.org/viewvc?rev=1338630&view=rev
Log:
BOOKKEEPER-209: Typo in ServerConfiguration for READAHEAD_ENABLED (ivank)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1338630&r1=1338629&r2=1338630&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Tue May 15 10:28:38 2012
@@ -128,6 +128,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-245: Intermittent failures in PersistanceManager tests (ivank)
 
+        BOOKKEEPER-209: Typo in ServerConfiguration for READAHEAD_ENABLED (ivank)
+
       bookkeeper-benchmark/
 	
 	BOOKKEEPER-207: BenchBookie doesn't run correctly (ivank via fpj)

Modified: zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java?rev=1338630&r1=1338629&r2=1338630&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java (original)
+++ zookeeper/bookkeeper/trunk/hedwig-server/src/main/java/org/apache/hedwig/server/common/ServerConfiguration.java Tue May 15 10:28:38 2012
@@ -45,7 +45,7 @@ public class ServerConfiguration extends
     protected final static String ZK_PREFIX = "zk_prefix";
     protected final static String ZK_HOST = "zk_host";
     protected final static String ZK_TIMEOUT = "zk_timeout";
-    protected final static String READAHEAD_ENABLED = "readhead_enabled";
+    protected final static String READAHEAD_ENABLED = "readahead_enabled";
     protected final static String STANDALONE = "standalone";
     protected final static String REGIONS = "regions";
     protected final static String CERT_NAME = "cert_name";
@@ -181,7 +181,9 @@ public class ServerConfiguration extends
     }
 
     public boolean getReadAheadEnabled() {
-        return conf.getBoolean(READAHEAD_ENABLED, true);
+        return conf.getBoolean(READAHEAD_ENABLED, true)
+            || conf.getBoolean("readhead_enabled");
+        // the key was misspelt in a previous version, so compensate here
     }
 
     public boolean isStandalone() {