Updated Branches:
  refs/heads/trunk bdb2fdc64 -> 493a46613

KAFKA-985 integer overflow in log time configuration values. Patch from Frank 
Fejes.


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

Branch: refs/heads/trunk
Commit: 493a46613e9a90c0879de96d04c42696fdf95510
Parents: bdb2fdc
Author: Jay Kreps <[email protected]>
Authored: Sat Aug 3 09:58:48 2013 -0700
Committer: Jay Kreps <[email protected]>
Committed: Sat Aug 3 09:58:48 2013 -0700

----------------------------------------------------------------------
 core/src/main/scala/kafka/server/KafkaServer.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/kafka/blob/493a4661/core/src/main/scala/kafka/server/KafkaServer.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/kafka/server/KafkaServer.scala 
b/core/src/main/scala/kafka/server/KafkaServer.scala
index 562aa72..2176958 100644
--- a/core/src/main/scala/kafka/server/KafkaServer.scala
+++ b/core/src/main/scala/kafka/server/KafkaServer.scala
@@ -249,11 +249,11 @@ class KafkaServer(val config: KafkaConfig, time: Time = 
SystemTime) extends Logg
   
   private def createLogManager(zkClient: ZkClient): LogManager = {
     val defaultLogConfig = LogConfig(segmentSize = config.logSegmentBytes, 
-                                     segmentMs = 60 * 60 * 1000 * 
config.logRollHours,
+                                     segmentMs = 60L * 60L * 1000L * 
config.logRollHours,
                                      flushInterval = 
config.logFlushIntervalMessages,
                                      flushMs = 
config.logFlushIntervalMs.toLong,
                                      retentionSize = config.logRetentionBytes,
-                                     retentionMs = 60 * 60 * 1000 * 
config.logRetentionHours,
+                                     retentionMs = 60L * 60L * 1000L * 
config.logRetentionHours,
                                      maxMessageSize = config.messageMaxBytes,
                                      maxIndexSize = 
config.logIndexSizeMaxBytes,
                                      indexInterval = 
config.logIndexIntervalBytes,

Reply via email to