Author: kwright
Date: Wed Sep 17 01:16:22 2014
New Revision: 1625448
URL: http://svn.apache.org/r1625448
Log:
Pull up fix for CONNECTORS-1020 from dev_1x branch
Modified:
manifoldcf/branches/release-1.7-branch/ (props changed)
manifoldcf/branches/release-1.7-branch/CHANGES.txt
manifoldcf/branches/release-1.7-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Propchange: manifoldcf/branches/release-1.7-branch/
------------------------------------------------------------------------------
Merged /manifoldcf/branches/dev_1x:r1622214
Merged /manifoldcf/trunk:r1622213
Modified: manifoldcf/branches/release-1.7-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/CHANGES.txt?rev=1625448&r1=1625447&r2=1625448&view=diff
==============================================================================
--- manifoldcf/branches/release-1.7-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.7-branch/CHANGES.txt Wed Sep 17 01:16:22 2014
@@ -8,6 +8,9 @@ CONNECTORS-1031: Fix Zookeeper synchroni
against short tick time settings.
(Karl Wright)
+CONNECTORS-1020: Email connector misuse of variable names.
+(Karl Wright, Paul Boichat)
+
CONNECTORS-1014: Fix the fact that Solr Cloud no longer sets
a content type in its responses.
(Kamil Zyta, Karl Wright)
Modified:
manifoldcf/branches/release-1.7-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.7-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1625448&r1=1625447&r2=1625448&view=diff
==============================================================================
---
manifoldcf/branches/release-1.7-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
(original)
+++
manifoldcf/branches/release-1.7-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
Wed Sep 17 01:16:22 2014
@@ -560,8 +560,8 @@ public class EmailConnector extends org.
rd.addField(EmailConfig.EMAIL_SUBJECT, subject);
} else if
(metadata.toLowerCase().equals(EmailConfig.EMAIL_BODY)) {
Multipart mp = (Multipart) msg.getContent();
- for (int j = 0, n = mp.getCount(); i < n; i++) {
- Part part = mp.getBodyPart(i);
+ for (int k = 0, n = mp.getCount(); k < n; k++) {
+ Part part = mp.getBodyPart(k);
String disposition = part.getDisposition();
if ((disposition == null)) {
MimeBodyPart mbp = (MimeBodyPart) part;
@@ -579,8 +579,8 @@ public class EmailConnector extends org.
Multipart mp = (Multipart) msg.getContent();
if (mp != null) {
String[] encoding = new String[mp.getCount()];
- for (int k = 0, n = mp.getCount(); i < n; i++) {
- Part part = mp.getBodyPart(i);
+ for (int k = 0, n = mp.getCount(); k < n; k++) {
+ Part part = mp.getBodyPart(k);
String disposition = part.getDisposition();
if ((disposition != null) &&
((disposition.equals(Part.ATTACHMENT) ||
@@ -594,8 +594,8 @@ public class EmailConnector extends org.
} else if
(metadata.toLowerCase().equals(EmailConfig.EMAIL_ATTACHMENT_MIMETYPE)) {
Multipart mp = (Multipart) msg.getContent();
String[] MIMEType = new String[mp.getCount()];
- for (int k = 0, n = mp.getCount(); i < n; i++) {
- Part part = mp.getBodyPart(i);
+ for (int k = 0, n = mp.getCount(); k < n; k++) {
+ Part part = mp.getBodyPart(k);
String disposition = part.getDisposition();
if ((disposition != null) &&
((disposition.equals(Part.ATTACHMENT) ||
