From 915926ef90b67accfd0b023197ea4e2f8114926f Mon Sep 17 00:00:00 2001 From: Bogdan Calmac Date: Sat, 30 Aug 2014 08:41:24 -0700 Subject: [PATCH] KAFKA-1577; Check that the counter is available before decrementing in ConnectionQuotas --- core/src/main/scala/kafka/network/SocketServer.scala | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/core/src/main/scala/kafka/network/SocketServer.scala b/core/src/main/scala/kafka/network/SocketServer.scala index ff0c4ba..552a0c5 100644 --- a/core/src/main/scala/kafka/network/SocketServer.scala +++ b/core/src/main/scala/kafka/network/SocketServer.scala @@ -467,11 +467,15 @@ class ConnectionQuotas(val defaultMax: Int, overrideQuotas: Map[String, Int]) { def dec(addr: InetAddress) { counts synchronized { - val count = counts.get(addr).get - if(count == 1) - counts.remove(addr) - else - counts.put(addr, count - 1) + val countOption = counts.get(addr) + // KAFKA-1577; the count might not be available + if (countOption.isDefined) { + val count = countOption.get + if(count == 1) + counts.remove(addr) + else + counts.put(addr, count - 1) + } } } -- 1.8.5.2 (Apple Git-48)