From d04c0be68a0fe65fffa061696d755f8475f21d56 Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Thu, 18 Nov 2010 21:49:01 -0500
Subject: [PATCH] removed 'lastPage' boolean flag from SearchResults since it
 was never being used (was always false)

---
 .../integration/twitter/core/SearchResults.java     | 13 +------------
 .../integration/twitter/core/Twitter4jTemplate.java |  2 +-
 .../inbound/AbstractTwitterMessageSource.java       |  6 +++---
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/SearchResults.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/SearchResults.java
index 05265675f9..337c982ae7 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/SearchResults.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/SearchResults.java
@@ -32,14 +32,11 @@ public class SearchResults {
 
 	private long sinceId;
 
-	private boolean lastPage;
 
-
-	public SearchResults(List<Tweet> tweets, long maxId, long sinceId, boolean lastPage) {
+	public SearchResults(List<Tweet> tweets, long maxId, long sinceId) {
 		this.tweets = tweets;
 		this.maxId = maxId;
 		this.sinceId = sinceId;
-		this.lastPage = lastPage;
 	}
 
 
@@ -64,12 +61,4 @@ public class SearchResults {
 		return sinceId;
 	}
 
-	/**
-	 * Returns <code>true</code> if this is the last page of matching {@link Tweet}s,
-	 * <code>false</code> if there are more pages that follow this one.
-	 */
-	public boolean isLastPage() {
-		return lastPage;
-	}
-
 }
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
index 017f3a4755..3d9823932d 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/Twitter4jTemplate.java
@@ -204,7 +204,7 @@ public class Twitter4jTemplate implements TwitterOperations {
 			if (result != null) {
 				List<twitter4j.Tweet> t4jTweets = result.getTweets();
 				List<Tweet> tweets = this.buildTweetsFromTwitterResponses(t4jTweets);
-				SearchResults results = new SearchResults(tweets, result.getMaxId(), result.getSinceId(), false);
+				SearchResults results = new SearchResults(tweets, result.getMaxId(), result.getSinceId());
 				return results;
 			}
 		}
diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
index 45d5f50d98..c60be8993a 100644
--- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
+++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java
@@ -70,7 +70,7 @@ abstract class AbstractTwitterMessageSource<T> extends IntegrationObjectSupport
 
 	private final TweetComparator tweetComparator = new TweetComparator();
 
-	private final Object markerGuard = new Object();
+	private final Object lastEnqueuedIdMonitor = new Object();
 
 
 	public AbstractTwitterMessageSource(TwitterOperations twitterOperations) {
@@ -148,11 +148,11 @@ abstract class AbstractTwitterMessageSource<T> extends IntegrationObjectSupport
 	}
 
 	private void enqueue(Tweet tweet) {
-		synchronized (this.markerGuard) {
+		synchronized (this.lastEnqueuedIdMonitor) {
 			long id = tweet.getId();
 			if (id > this.lastEnqueuedId) {
-				this.lastEnqueuedId = id;
 				this.tweets.add(tweet);
+				this.lastEnqueuedId = id;
 			}
 		}
 	}