Author: kwright
Date: Mon Jun 18 18:37:51 2018
New Revision: 1833746
URL: http://svn.apache.org/viewvc?rev=1833746&view=rev
Log:
Fix for CONNECTORS-1510.
Modified:
manifoldcf/trunk/CHANGES.txt
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Modified: manifoldcf/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1833746&r1=1833745&r2=1833746&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Mon Jun 18 18:37:51 2018
@@ -3,6 +3,8 @@ $Id$
======================= 2.11-dev =====================
+CONNECTORS-1510: Fix NPE in solr connector with null mime type.
+
CONNECTORS-1507: Restarting the cluster could leave documents
that were formerly active in PENDING or PENDINGPURGATORY without
document priorities.
Modified:
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
URL:
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java?rev=1833746&r1=1833745&r2=1833746&view=diff
==============================================================================
---
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
(original)
+++
manifoldcf/trunk/connectors/solr/connector/src/main/java/org/apache/manifoldcf/agents/output/solr/HttpPoster.java
Mon Jun 18 18:37:51 2018
@@ -808,7 +808,7 @@ public class HttpPoster
public static boolean checkMimeTypeIndexable(final String mimeType, final
boolean useExtractUpdateHandler,
final Set<String> includedMimeTypes, final Set<String> excludedMimeTypes)
{
- final String lowerMimeType = mimeType.toLowerCase(Locale.ROOT);
+ final String lowerMimeType =
(mimeType==null)?null:mimeType.toLowerCase(Locale.ROOT);
if (useExtractUpdateHandler)
{
if (includedMimeTypes != null &&
!includedMimeTypes.contains(lowerMimeType))
