svn commit: r1564912 - in /manifoldcf/trunk: CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java

[kwright]

Author: kwright
Date: Wed Feb  5 20:16:00 2014
New Revision: 1564912

URL: http://svn.apache.org/r1564912
Log:
Fix for CONNECTORS-882

Modified:
    manifoldcf/trunk/CHANGES.txt
    
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1564912&r1=1564911&r2=1564912&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Wed Feb  5 20:16:00 2014
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 1.6-dev =====================
 
+CONNECTORS-882: Solr connector: Keep all metadata fixed.
+(Alessandro Benedetti, Karl Wright)
+
 CONNECTORS-880: Fix handling of output connector errors during
 clean up phase.
 (Florian Schmedding, Karl Wright)

Modified: 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1564912&r1=1564911&r2=1564912&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Wed Feb  5 20:16:00 2014
@@ -661,8 +661,12 @@ public class SolrConnector extends org.a
     index = unpackList(nameValues,outputDescription,index,'+');
     ArrayList sts = new ArrayList();
     index = unpackList(sts,outputDescription,index,'+');
-    ArrayList metadataExtraParams = new ArrayList();
-    index = unpackList(metadataExtraParams, outputDescription, index, '+');
+    // extract keep all metadata Flag
+    boolean keepAllMetadata = true;
+    if (index < outputDescription.length())
+    {
+      keepAllMetadata = (outputDescription.charAt(index++) == '+');
+    }
     String[] fixedBuffer = new String[2];
     
     // Do the name/value pairs
@@ -696,13 +700,7 @@ public class SolrConnector extends org.a
       list.add(target);
     }
 
-    // extract keep all metadata Flag
-    boolean keepAllMetadata = true;
-    if (index < outputDescription.length())
-    {
-      keepAllMetadata = (outputDescription.charAt(index++) == '+');
-    }
-    
+
     // Establish a session
     getSession();