BOOKKEEPER-115: LocalBookKeeper fails after BOOKKEEPER-108 (ivank)

git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1203774 13f79535-47bb-0310-9956-ffa450edef68

Author: ivankelly

CHANGES.txt

@@ -76,6 +76,8 @@ BUGFIXES:
 
   BOOKKEEPER-108: add configuration support for BK (Sijie via ivank)
 
+  BOOKKEEPER-115: LocalBookKeeper fails after BOOKKEEPER-108 (ivank)
+
  hedwig-server/
 
   BOOKKEEPER-43: NullPointException when releasing topic (Sijie Guo via breed)

bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ClientConfiguration.java

@@ -80,7 +80,7 @@ public int getThrottleValue() {
      * @return client configuration
      */
     public ClientConfiguration setThrottleValue(int throttle) {
-        this.addProperty(THROTTLE, Integer.toString(throttle));
+        this.setProperty(THROTTLE, Integer.toString(throttle));
         return this;
     }
 
@@ -109,7 +109,7 @@ public DigestType getBookieRecoveryDigestType() {
      * @return client configuration
      */
     public ClientConfiguration setBookieRecoveryDigestType(DigestType digestType) {
-        this.addProperty(DIGEST_TYPE, digestType.toString());
+        this.setProperty(DIGEST_TYPE, digestType.toString());
         return this;
     }
 
@@ -138,7 +138,7 @@ public byte[] getBookieRecoveryPasswd() {
      * @return client configuration
      */
     public ClientConfiguration setBookieRecoveryPasswd(byte[] passwd) {
-        addProperty(PASSWD, new String(passwd));
+        setProperty(PASSWD, new String(passwd));
         return this;
     }
 
@@ -168,7 +168,7 @@ public boolean getClientTcpNoDelay() {
      * @return client configuration
      */
     public ClientConfiguration setClientTcpNoDelay(boolean noDelay) {
-        addProperty(CLIENT_TCP_NODELAY, Boolean.toString(noDelay));
+        setProperty(CLIENT_TCP_NODELAY, Boolean.toString(noDelay));
         return this;
     }
 
@@ -188,7 +188,7 @@ public String getZkServers() {
      *          ZooKeeper servers to connect
      */
     public ClientConfiguration setZkServers(String zkServers) {
-        addProperty(ZK_SERVERS, zkServers);
+        setProperty(ZK_SERVERS, zkServers);
         return this;
     }
 
@@ -209,7 +209,7 @@ public int getZkTimeout() {
      * @return client configuration
      */
     public ClientConfiguration setZkTimeout(int zkTimeout) {
-        addProperty(ZK_SERVERS, Integer.toString(zkTimeout));
+        setProperty(ZK_SERVERS, Integer.toString(zkTimeout));
         return this;
     }
 

bookkeeper-server/src/main/java/org/apache/bookkeeper/conf/ServerConfiguration.java

@@ -88,7 +88,7 @@ public long getEntryLogSizeLimit() {
      *          new log size limitation
      */
     public ServerConfiguration setEntryLogSizeLimit(long logSizeLimit) {
-        this.addProperty(ENTRY_LOG_SIZE_LIMIT, Long.toString(logSizeLimit));
+        this.setProperty(ENTRY_LOG_SIZE_LIMIT, Long.toString(logSizeLimit));
         return this;
     }
 
@@ -109,7 +109,7 @@ public long getGcWaitTime() {
      * @return server configuration
      */
     public ServerConfiguration setGcWaitTime(long gcWaitTime) {
-        this.addProperty(GC_WAIT_TIME, Long.toString(gcWaitTime));
+        this.setProperty(GC_WAIT_TIME, Long.toString(gcWaitTime));
         return this;
     }
 
@@ -130,7 +130,7 @@ public int getFlushInterval() {
      * @return server configuration
      */
     public ServerConfiguration setFlushInterval(int flushInterval) {
-        this.addProperty(FLUSH_INTERVAL, Integer.toString(flushInterval));
+        this.setProperty(FLUSH_INTERVAL, Integer.toString(flushInterval));
         return this;
     }
 
@@ -187,7 +187,7 @@ public long getMaxJournalSize() {
      * @return server configuration
      */
     public ServerConfiguration setMaxJournalSize(long maxJournalSize) {
-        this.addProperty(MAX_JOURNAL_SIZE, Long.toString(maxJournalSize));
+        this.setProperty(MAX_JOURNAL_SIZE, Long.toString(maxJournalSize));
         return this;
     }
 
@@ -208,7 +208,7 @@ public int getMaxBackupJournals() {
      * @return server configuration
      */
     public ServerConfiguration setMaxBackupJournals(int maxBackupJournals) {
-        this.addProperty(MAX_BACKUP_JOURNALS, Integer.toString(maxBackupJournals));
+        this.setProperty(MAX_BACKUP_JOURNALS, Integer.toString(maxBackupJournals));
         return this;
     }
 
@@ -229,7 +229,7 @@ public int getBookiePort() {
      * @return server configuration
      */
     public ServerConfiguration setBookiePort(int port) {
-        this.addProperty(BOOKIE_PORT, Integer.toString(port));
+        this.setProperty(BOOKIE_PORT, Integer.toString(port));
         return this;
     }
 
@@ -250,7 +250,7 @@ public String getJournalDirName() {
      * @return server configuration
      */
     public ServerConfiguration setJournalDirName(String journalDir) {
-        this.addProperty(JOURNAL_DIR, journalDir);
+        this.setProperty(JOURNAL_DIR, journalDir);
         return this;
     }
 
@@ -291,7 +291,7 @@ public ServerConfiguration setLedgerDirNames(String[] ledgerDirs) {
         if (null == ledgerDirs) {
             return this;
         }
-        this.addProperty(LEDGER_DIRS, StringUtils.join(ledgerDirs, SEP));
+        this.setProperty(LEDGER_DIRS, StringUtils.join(ledgerDirs, SEP));
         return this;
     }
 
@@ -329,7 +329,7 @@ public boolean getServerTcpNoDelay() {
      * @return server configuration
      */
     public ServerConfiguration setServerTcpNoDelay(boolean noDelay) {
-        addProperty(SERVER_TCP_NODELAY, Boolean.toString(noDelay));
+        setProperty(SERVER_TCP_NODELAY, Boolean.toString(noDelay));
         return this;
     }
 
@@ -349,7 +349,7 @@ public String getZkServers() {
      *          ZooKeeper servers to connect
      */
     public ServerConfiguration setZkServers(String zkServers) {
-        addProperty(ZK_SERVERS, zkServers);
+        setProperty(ZK_SERVERS, zkServers);
         return this;
     }
 
@@ -370,7 +370,7 @@ public int getZkTimeout() {
      * @return server configuration
      */
     public ServerConfiguration setZkTimeout(int zkTimeout) {
-        addProperty(ZK_SERVERS, Integer.toString(zkTimeout));
+        setProperty(ZK_SERVERS, Integer.toString(zkTimeout));
         return this;
     }