[bookkeeper] branch master updated: Address the problem on merging #183

[zh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bookkeeper.git


The following commit(s) were added to refs/heads/master by this push:
     new 41f63c8  Address the problem on merging #183
41f63c8 is described below

commit 41f63c86a3d228887f08946dde14d485a40ac7b9
Author: Sijie Guo <si...@apache.org>
AuthorDate: Wed Aug 2 09:16:31 2017 +0800

    Address the problem on merging #183
    
    Descriptions of the changes in this PR:
    
    listenOn should be running in constructing netty server. because we use binding to prevent two bookies start at the same time. #183
    
    Author: Sijie Guo <si...@apache.org>
    
    Reviewers: Jia Zhai <None>
    
    This closes #348 from sijie/ssl_merge, closes #183
---
 .../src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
index 17fbbcb..2308bc6 100644
--- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
+++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/proto/BookieNettyServer.java
@@ -142,6 +142,7 @@ class BookieNettyServer {
         } else {
             bindAddress = bookieAddress.getSocketAddress();
         }
+        listenOn(bindAddress, bookieAddress);
     }
 
     public BookieNettyServer setRequestProcessor(RequestProcessor processor) {
@@ -374,7 +375,6 @@ class BookieNettyServer {
     }
 
     void start() throws InterruptedException {
-        listenOn(bindAddress, bookieAddress);
         isRunning.set(true);
     }
 

-- 
To stop receiving notification emails like this one, please contact
['"commits@bookkeeper.apache.org" <co...@bookkeeper.apache.org>'].