svn commit: r1651983 - in /manifoldcf/branches/release-2.0-branch: ./ CHANGES.txt framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java

[kwright]

Author: kwright
Date: Thu Jan 15 08:59:01 2015
New Revision: 1651983

URL: http://svn.apache.org/r1651983
Log:
Pull up fix for CONNECTORS-1138 from trunk

Modified:
    manifoldcf/branches/release-2.0-branch/   (props changed)
    manifoldcf/branches/release-2.0-branch/CHANGES.txt
    
manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java

Propchange: manifoldcf/branches/release-2.0-branch/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 15 08:59:01 2015
@@ -119,4 +119,4 @@
 /manifoldcf/branches/CONNECTORS-981:1605049-1605773
 /manifoldcf/branches/CONNECTORS-989:1611600-1612101
 /manifoldcf/branches/CONNECTORS-990:1610284-1610707
-/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608
+/manifoldcf/trunk:1644252,1644399,1644538,1644920,1644931,1646317,1646397,1646403,1646640,1646947,1647574,1647577,1647608,1650351

Modified: manifoldcf/branches/release-2.0-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/CHANGES.txt?rev=1651983&r1=1651982&r2=1651983&view=diff
==============================================================================
--- manifoldcf/branches/release-2.0-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-2.0-branch/CHANGES.txt Thu Jan 15 08:59:01 2015
@@ -4,6 +4,9 @@ $Id$
 
 ======================= Release 2.0.1 =====================
 
+CONNECTORS-1138: Loss of all metadata fields but one on pipeline
+bifurcation.
+(Salih Sen, Karl Wright)
 
 ======================= Release 2.0 =====================
 

Modified: 
manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java?rev=1651983&r1=1651982&r2=1651983&view=diff
==============================================================================
--- 
manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java
 (original)
+++ 
manifoldcf/branches/release-2.0-branch/framework/agents/src/main/java/org/apache/manifoldcf/agents/incrementalingest/RepositoryDocumentFactory.java
 Thu Jan 15 08:59:01 2015
@@ -56,13 +56,12 @@ public class RepositoryDocumentFactory
     throws ManifoldCFException, IOException
   {
     this.original = document;
-    
     try
     {
       this.binaryTracker = new TempFileInput(document.getBinaryStream());
       // Copy all reader streams
       Iterator<String> iter = document.getFields();
-      if (iter.hasNext())
+      while (iter.hasNext())
       {
         String fieldName = iter.next();
         Object[] objects = document.getField(fieldName);
@@ -133,7 +132,7 @@ public class RepositoryDocumentFactory
     rd.setBinary(binaryTracker.getStream(),original.getBinaryLength());
     // Copy metadata fields (including minting new Readers where needed)
     Iterator<String> iter = original.getFields();
-    if (iter.hasNext())
+    while (iter.hasNext())
     {
       String fieldName = iter.next();
       Object[] objects = original.getField(fieldName);