You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by no...@apache.org on 2011/06/25 21:36:10 UTC
svn commit: r1139598 - in /james/mailbox/trunk:
jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
Author: norman
Date: Sat Jun 25 19:36:10 2011
New Revision: 1139598
URL: http://svn.apache.org/viewvc?rev=1139598&view=rev
Log:
Make sure the headers limit is calculate the right way
Modified:
james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
Modified: james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java?rev=1139598&r1=1139597&r2=1139598&view=diff
==============================================================================
--- james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java (original)
+++ james/mailbox/trunk/jcr/src/main/java/org/apache/james/mailbox/jcr/mail/model/JCRMessage.java Sat Jun 25 19:36:10 2011
@@ -754,6 +754,10 @@ public class JCRMessage extends Abstract
* @see org.apache.james.mailbox.store.mail.model.Message#getHeaderContent()
*/
public InputStream getHeaderContent() throws IOException {
- return new BoundedInputStream(getFullContent(), getBodyStartOctet() - 2);
+ long limit = getBodyStartOctet() -2;
+ if (limit < 0) {
+ limit = 0;
+ }
+ return new BoundedInputStream(getFullContent(), limit);
}
}
Modified: james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java
URL: http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java?rev=1139598&r1=1139597&r2=1139598&view=diff
==============================================================================
--- james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java (original)
+++ james/mailbox/trunk/maildir/src/main/java/org/apache/james/mailbox/maildir/mail/model/MaildirMessage.java Sat Jun 25 19:36:10 2011
@@ -450,8 +450,11 @@ public class MaildirMessage extends Abst
@Override
public InputStream getHeaderContent() throws IOException {
parseMessage();
-
- return new BoundedInputStream(getFullContent(), bodyStartOctet - 2);
+ long limit = getBodyStartOctet() -2;
+ if (limit < 0) {
+ limit = 0;
+ }
+ return new BoundedInputStream(getFullContent(), limit);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org