From af190a866d9c264a62cdd9cf5b5945659472a4d8 Mon Sep 17 00:00:00 2001 From: Balaji Seshadri Date: Mon, 29 Sep 2014 03:42:41 -0600 Subject: [PATCH 1/2] KAFKA-1618 Exception thrown when running console producer with no port number for the broker --- core/src/main/scala/kafka/utils/ToolsUtils.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/kafka/utils/ToolsUtils.scala b/core/src/main/scala/kafka/utils/ToolsUtils.scala index cfbf279..dbfcfde 100644 --- a/core/src/main/scala/kafka/utils/ToolsUtils.scala +++ b/core/src/main/scala/kafka/utils/ToolsUtils.scala @@ -29,7 +29,7 @@ object ToolsUtils { Array(hostPort) val validHostPort = hostPorts.filter { hostPortData => - regex.findAllMatchIn(hostPortData).size > 0 + regex.findAllIn(hostPortData).size > 0 } val isValid = !(validHostPort.isEmpty) && validHostPort.size == hostPorts.length if(!isValid) -- 1.8.5.2 (Apple Git-48) From d8eb69dc88aafde49c0292446a4e33e1ea11e127 Mon Sep 17 00:00:00 2001 From: Balaji Seshadri Date: Mon, 29 Sep 2014 12:17:27 -0600 Subject: [PATCH 2/2] KAFKA-1618 Exception thrown when running console producer with no port number for the broker --- core/src/main/scala/kafka/utils/ToolsUtils.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/main/scala/kafka/utils/ToolsUtils.scala b/core/src/main/scala/kafka/utils/ToolsUtils.scala index dbfcfde..fef9392 100644 --- a/core/src/main/scala/kafka/utils/ToolsUtils.scala +++ b/core/src/main/scala/kafka/utils/ToolsUtils.scala @@ -17,19 +17,17 @@ package kafka.utils import joptsimple.OptionParser -import scala.util.matching.Regex object ToolsUtils { def validatePortOrDie(parser: OptionParser, hostPort: String) = { - val regex = new Regex(":[0-9]") val hostPorts: Array[String] = if(hostPort.contains(',')) hostPort.split(",") else Array(hostPort) val validHostPort = hostPorts.filter { hostPortData => - regex.findAllIn(hostPortData).size > 0 + org.apache.kafka.common.utils.Utils.getPort(hostPortData) != null } val isValid = !(validHostPort.isEmpty) && validHostPort.size == hostPorts.length if(!isValid) -- 1.8.5.2 (Apple Git-48)