Author: mahadev
Date: Tue Mar 9 20:50:14 2010
New Revision: 921117
URL: http://svn.apache.org/viewvc?rev=921117&view=rev
Log:
ZOOKEEPER-691. Interface changed for NIOServer.Factory (breed via mahadev)
Modified:
hadoop/zookeeper/trunk/CHANGES.txt
hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/util/LocalBookKeeper.java
Modified: hadoop/zookeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/CHANGES.txt?rev=921117&r1=921116&r2=921117&view=diff
==============================================================================
--- hadoop/zookeeper/trunk/CHANGES.txt (original)
+++ hadoop/zookeeper/trunk/CHANGES.txt Tue Mar 9 20:50:14 2010
@@ -252,6 +252,8 @@ BUGFIXES:
ZOOKEEPER-59. Synchronized block in NIOServerCnxn (flavio via mahadev)
+ ZOOKEEPER-691. Interface changed for NIOServer.Factory (breed via mahadev)
+
IMPROVEMENTS:
ZOOKEEPER-473. cleanup junit tests to eliminate false positives due to
"socket reuse" and failure to close client (phunt via mahadev)
Modified:
hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/util/LocalBookKeeper.java
URL:
http://svn.apache.org/viewvc/hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/util/LocalBookKeeper.java?rev=921117&r1=921116&r2=921117&view=diff
==============================================================================
---
hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/util/LocalBookKeeper.java
(original)
+++
hadoop/zookeeper/trunk/src/contrib/bookkeeper/src/java/org/apache/bookkeeper/util/LocalBookKeeper.java
Tue Mar 9 20:50:14 2010
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStream;
+import java.net.InetSocketAddress;
import java.net.Socket;
import org.apache.bookkeeper.proto.BookieServer;
@@ -86,7 +87,7 @@ public class LocalBookKeeper {
try {
zks = new ZooKeeperServer(ZkTmpDir, ZkTmpDir,
ZooKeeperDefaultPort);
- serverFactory = new
NIOServerCnxn.Factory(ZooKeeperDefaultPort);
+ serverFactory = new NIOServerCnxn.Factory(new
InetSocketAddress(ZooKeeperDefaultPort));
serverFactory.startup(zks);
} catch (Exception e) {
// TODO Auto-generated catch block
