fix merge break

This commit is contained in:
Fangjin Yang 2012-11-02 15:59:55 -07:00
parent b1b611735e
commit a5c3eab2f1
1 changed files with 1 additions and 1 deletions

View File

@ -221,7 +221,7 @@ public class BrokerNode extends BaseNode<BrokerNode>
final ServiceDiscoveryConfig serviceDiscoveryConfig = getConfigFactory().build(ServiceDiscoveryConfig.class); final ServiceDiscoveryConfig serviceDiscoveryConfig = getConfigFactory().build(ServiceDiscoveryConfig.class);
CuratorFramework curatorFramework = Initialization.makeCuratorFrameworkClient( CuratorFramework curatorFramework = Initialization.makeCuratorFrameworkClient(
serviceDiscoveryConfig.getZkHosts(), lifecycle serviceDiscoveryConfig, lifecycle
); );
final ServiceDiscovery serviceDiscovery = Initialization.makeServiceDiscoveryClient( final ServiceDiscovery serviceDiscovery = Initialization.makeServiceDiscoveryClient(