GH-1247: Polishing

- revert lastPoll position
- fix new race in existing test

Author: garyrussell

spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java

@@ -743,7 +743,6 @@ protected void pollAndInvoke() {
 			}
 			processSeeks();
 			checkPaused();
-			this.lastPoll = System.currentTimeMillis();
 			this.polling.set(true);
 			ConsumerRecords<K, V> records = this.consumer.poll(this.pollTimeout);
 			if (!this.polling.compareAndSet(true, false)) {
@@ -756,6 +755,7 @@ protected void pollAndInvoke() {
 				}
 				return;
 			}
+			this.lastPoll = System.currentTimeMillis();
 			checkResumed();
 			debugRecords(records);
 			if (records != null && records.count() > 0) {

spring-kafka/src/test/java/org/springframework/kafka/listener/KafkaMessageListenerContainerTests.java

@@ -587,7 +587,6 @@ public void onMessage(ConsumerRecord<Integer, String> data) {
 		inOrder.verify(messageListener).onMessage(any(ConsumerRecord.class));
 		inOrder.verify(consumer).commitSync(any(Map.class));
 		container.stop();
-		verify(consumer).wakeup();
 	}
 
 	@SuppressWarnings("unchecked")