svn commit: r1566610 - in /manifoldcf/branches/release-1.5-branch: ./ CHANGES.txt connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java

[kwright]

Author: kwright
Date: Mon Feb 10 13:16:02 2014
New Revision: 1566610

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

Modified:
    manifoldcf/branches/release-1.5-branch/   (props changed)
    manifoldcf/branches/release-1.5-branch/CHANGES.txt
    
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java

Propchange: manifoldcf/branches/release-1.5-branch/
------------------------------------------------------------------------------
  Merged /manifoldcf/trunk:r1564912

Modified: manifoldcf/branches/release-1.5-branch/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/CHANGES.txt?rev=1566610&r1=1566609&r2=1566610&view=diff
==============================================================================
--- manifoldcf/branches/release-1.5-branch/CHANGES.txt (original)
+++ manifoldcf/branches/release-1.5-branch/CHANGES.txt Mon Feb 10 13:16:02 2014
@@ -4,6 +4,8 @@ $Id$
 
 ======================= Release 1.5.1 =====================
 
+CONNECTORS-882: Solr connector: Keep all metadata fixed.
+(Alessandro Benedetti, Karl Wright)
 
 ======================= Release 1.5 =====================
 

Modified: 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java?rev=1566610&r1=1566609&r2=1566610&view=diff
==============================================================================
--- 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 (original)
+++ 
manifoldcf/branches/release-1.5-branch/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/SolrConnector.java
 Mon Feb 10 13:16:02 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();