You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by jk...@apache.org on 2015/04/05 00:32:11 UTC

[1/2] kafka git commit: KAFKA-2050 Avoid calling .size() on linked list.

Repository: kafka
Updated Branches:
  refs/heads/trunk 6adaffd8e -> a686a67f6


KAFKA-2050 Avoid calling .size() on linked list.


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

Branch: refs/heads/trunk
Commit: 70e5c92e213bff7502288c610c252735d6b68c08
Parents: 6adaffd
Author: Tim Brooks <ti...@staples.com>
Authored: Sat Apr 4 15:17:09 2015 -0700
Committer: Jay Kreps <ja...@gmail.com>
Committed: Sat Apr 4 15:17:09 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/kafka/blob/70e5c92e/core/src/main/scala/kafka/network/SocketServer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/network/SocketServer.scala b/core/src/main/scala/kafka/network/SocketServer.scala
index 07ce58e..578283b 100644
--- a/core/src/main/scala/kafka/network/SocketServer.scala
+++ b/core/src/main/scala/kafka/network/SocketServer.scala
@@ -429,7 +429,7 @@ private[kafka] class Processor(val id: Int,
    * Register any new connections that have been queued up
    */
   private def configureNewConnections() {
-    while(newConnections.size() > 0) {
+    while(!newConnections.isEmpty) {
       val channel = newConnections.poll()
       debug("Processor " + id + " listening to new connection from " + channel.socket.getRemoteSocketAddress)
       channel.register(selector, SelectionKey.OP_READ)


[2/2] kafka git commit: KAFKA-2002: Mx4JLoader doesn't disable when kafka_mx4jenable=false.

Posted by jk...@apache.org.
KAFKA-2002: Mx4JLoader doesn't disable when kafka_mx4jenable=false.


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

Branch: refs/heads/trunk
Commit: a686a67f60beb42eb3d4942508fb15b636e5100d
Parents: 70e5c92
Author: Yaguo Zhou <zh...@gmail.com>
Authored: Sat Apr 4 15:21:51 2015 -0700
Committer: Jay Kreps <ja...@gmail.com>
Committed: Sat Apr 4 15:27:41 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/kafka/blob/a686a67f/core/src/main/scala/kafka/utils/Mx4jLoader.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/utils/Mx4jLoader.scala b/core/src/main/scala/kafka/utils/Mx4jLoader.scala
index db9f20b..7417897 100644
--- a/core/src/main/scala/kafka/utils/Mx4jLoader.scala
+++ b/core/src/main/scala/kafka/utils/Mx4jLoader.scala
@@ -35,7 +35,7 @@ object Mx4jLoader extends Logging {
   def maybeLoad(): Boolean = {
     val props = new VerifiableProperties(System.getProperties())
     if (props.getBoolean("kafka_mx4jenable", false))
-      false
+      return false
     val address = props.getString("mx4jaddress", "0.0.0.0")
     val port = props.getInt("mx4jport", 8082)
     try {