svn commit: r1441480 - in /manifoldcf/trunk: CHANGES.txt connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java

[kwright]

Author: kwright
Date: Fri Feb  1 15:13:39 2013
New Revision: 1441480

URL: http://svn.apache.org/viewvc?rev=1441480&view=rev
Log:
Fix for CONNECTORS-637.

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

Modified: manifoldcf/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1441480&r1=1441479&r2=1441480&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Fri Feb  1 15:13:39 2013
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 1.2-dev =====================
 
+CONNECTORS-637: Interpret null mime types and extensions reasonably
+in ElasticSearch connector.
+(Andrew Clegg, Karl Wright)
+
 CONNECTORS-631: Support Znode path by Solr Output Connection.
 (Minoru Osuka)
 

Modified: 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java?rev=1441480&r1=1441479&r2=1441480&view=diff
==============================================================================
--- 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java
 (original)
+++ 
manifoldcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java
 Fri Feb  1 15:13:39 2013
@@ -156,11 +156,15 @@ public class ElasticSearchSpecs extends 
 
   public boolean checkExtension(String extension)
   {
+    if (extension == null)
+      return false;
     return extensionSet.contains(extension);
   }
 
   public boolean checkMimeType(String mimeType)
   {
+    if (mimeType == null)
+      return false;
     return mimeTypeSet.contains(mimeType);
   }
 }