Author: norman
Date: Mon Aug 10 06:51:35 2009
New Revision: 802664
URL: http://svn.apache.org/viewvc?rev=802664&view=rev
Log:
fix message index calculation
Modified:
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
Modified:
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
URL:
http://svn.apache.org/viewvc/labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java?rev=802664&r1=802663&r2=802664&view=diff
==============================================================================
---
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
(original)
+++
labs/hupa/src/main/java/org/apache/hupa/server/handler/FetchMessagesHandler.java
Mon Aug 10 06:51:35 2009
@@ -98,14 +98,19 @@
}
if (end > exists) {
- end = exists -1;
+ end = exists;
}
-
+
+ int firstIndex = exists - end;
+ if (firstIndex < 1) {
+ firstIndex = 1;
+ }
+ int lastIndex = exists - start;
Message[] messages;
// check if a searchString was given, and if so use it
if (searchString == null) {
- messages = f.getMessages(exists - end, exists -
start);
+ messages = f.getMessages(firstIndex,lastIndex);
} else {
SearchTerm subjectTerm = new
SubjectTerm(searchString);
SearchTerm fromTerm = new
FromStringTerm(searchString);
@@ -113,7 +118,7 @@
SearchTerm orTerm = new OrTerm(new
SearchTerm[]{subjectTerm,fromTerm,bodyTerm});
messages = f.search(orTerm);
if (end > messages.length) {
- end = messages.length -1;
+ end = messages.length;
}
exists = messages.length;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
