Author: kwright
Date: Mon Dec 14 08:07:26 2015
New Revision: 1719862
URL: http://svn.apache.org/viewvc?rev=1719862&view=rev
Log:
Pull up fix for CONNECTORS-1266 from trunk.
Modified:
manifoldcf/branches/release-2.3-branch/ (props changed)
manifoldcf/branches/release-2.3-branch/CHANGES.txt
manifoldcf/branches/release-2.3-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
Propchange: manifoldcf/branches/release-2.3-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 14 08:07:26 2015
@@ -134,4 +134,4 @@
/manifoldcf/branches/CONNECTORS-981:1605049-1605773
/manifoldcf/branches/CONNECTORS-989:1611600-1612101
/manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1719754
+/manifoldcf/trunk:1719754,1719845
Modified: manifoldcf/branches/release-2.3-branch/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/CHANGES.txt?rev=1719862&r1=1719861&r2=1719862&view=diff
==============================================================================
--- manifoldcf/branches/release-2.3-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.3-branch/CHANGES.txt Mon Dec 14 08:07:26 2015
@@ -4,6 +4,9 @@ $Id$
======================= Release 2.3 =====================
+CONNECTORS-1266: Fix an infinite loop in email notification connector.
+(Markus Schuch)
+
CONNECTORS-1265: Adjust interval for checking validity of http connection.
(Shinichiro Abe, Karl Wright)
Modified:
manifoldcf/branches/release-2.3-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
URL:
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.3-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java?rev=1719862&r1=1719861&r2=1719862&view=diff
==============================================================================
---
manifoldcf/branches/release-2.3-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
(original)
+++
manifoldcf/branches/release-2.3-branch/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/notifications/email/EmailConnector.java
Mon Dec 14 08:07:26 2015
@@ -295,7 +295,7 @@ public class EmailConnector extends org.
SpecificationNode childNode = spec.getChild(i);
if (childNode.getType().equals(nodeType))
{
- for (int j = 0; j < childNode.getChildCount(); i++) {
+ for (int j = 0; j < childNode.getChildCount(); j++) {
SpecificationNode sn = childNode.getChild(j);
if (sn.getType().equals(EmailConfig.NODE_TO))
to.add(sn.getAttributeValue(EmailConfig.ATTRIBUTE_VALUE));