kafka-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sriram...@apache.org
Subject [02/19] git commit: commit the remaining changes
Date Tue, 25 Feb 2014 08:27:12 GMT
commit the remaining changes


Project: http://git-wip-us.apache.org/repos/asf/kafka/repo
Commit: http://git-wip-us.apache.org/repos/asf/kafka/commit/b998f5d8
Tree: http://git-wip-us.apache.org/repos/asf/kafka/tree/b998f5d8
Diff: http://git-wip-us.apache.org/repos/asf/kafka/diff/b998f5d8

Branch: refs/heads/trunk
Commit: b998f5d8790cf6f4d079cba399f5c5ea8ea43e68
Parents: c304a92
Author: Sriram Subramanian <sriram.sub@gmail.com>
Authored: Wed Oct 9 10:47:18 2013 -0700
Committer: Sriram Subramanian <sriram.sub@gmail.com>
Committed: Wed Oct 9 10:47:18 2013 -0700

----------------------------------------------------------------------
 core/src/main/scala/kafka/admin/AdminUtils.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/b998f5d8/core/src/main/scala/kafka/admin/AdminUtils.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/admin/AdminUtils.scala b/core/src/main/scala/kafka/admin/AdminUtils.scala
index 1360955..9a8b0c9 100644
--- a/core/src/main/scala/kafka/admin/AdminUtils.scala
+++ b/core/src/main/scala/kafka/admin/AdminUtils.scala
@@ -100,7 +100,7 @@ object AdminUtils extends Logging {
 
     // create the new partition replication list
     val brokerList = ZkUtils.getSortedBrokerList(zkClient)
-    val newPartitionReplicaList = if (replicaAssignmentStr == "")
+    val newPartitionReplicaList = if (replicaAssignmentStr == null || replicaAssignmentStr
== "")
       AdminUtils.assignReplicasToBrokers(brokerList, partitionsToAdd, existingReplicaList.size,
existingReplicaList.head, existingPartitionsReplicaList.size)
     else
       getManualReplicaAssignment(replicaAssignmentStr, brokerList.toSet, existingPartitionsReplicaList.size)


Mime
View raw message