Index: core/src/test/scala/unit/kafka/utils/TestUtils.scala
===================================================================
--- core/src/test/scala/unit/kafka/utils/TestUtils.scala	(revision 1154262)
+++ core/src/test/scala/unit/kafka/utils/TestUtils.scala	(working copy)
@@ -209,7 +209,7 @@
    *  Throw an exception if an iterable has different length than expected
    *  
    */
-  def checkLength[T](s1: Iterator[T], expectedLength:Integer) {
+  def checkLength[T](s1: Iterator[T], expectedLength:Int) {
     var n = 0
     while (s1.hasNext) {
       n+=1
Index: core/src/main/scala/kafka/consumer/ZookeeperConsumerConnector.scala
===================================================================
--- core/src/main/scala/kafka/consumer/ZookeeperConsumerConnector.scala	(revision 1154262)
+++ core/src/main/scala/kafka/consumer/ZookeeperConsumerConnector.scala	(working copy)
@@ -126,6 +126,8 @@
           case None =>
         }
         sendShudownToAllQueues
+        if (config.autoCommit)
+          commitOffsets
         if (zkClient != null) {
           zkClient.close()
           zkClient = null