svn commit: r1646388 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java

[no...@apache.org]

Author: noble
Date: Thu Dec 18 06:34:35 2014
New Revision: 1646388

URL: http://svn.apache.org/r1646388
Log:
SOLR-6626 NPE when the filed values are null

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java?rev=1646388&r1=1646387&r2=1646388&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/AllValuesOrNoneFieldMutatingUpdateProcessor.java Thu Dec 18 06:34:35 2014
@@ -22,6 +22,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
                    
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 
@@ -75,9 +76,11 @@ public abstract class AllValuesOrNoneFie
   protected abstract Object mutateValue(final Object srcVal);
 
   protected final SolrInputField mutate(final SolrInputField srcField) {
+    Collection<Object> vals = srcField.getValues();
+    if(vals== null || vals.isEmpty()) return srcField;
     List<String> messages = null;
     SolrInputField result = new SolrInputField(srcField.getName());
-    for (final Object srcVal : srcField.getValues()) {
+    for (final Object srcVal : vals) {
       final Object destVal = mutateValue(srcVal);
       if (SKIP_FIELD_VALUE_LIST_SINGLETON == destVal) {
         log.debug("field '{}' {} value '{}' is not mutatable, so no values will be mutated",