Return-Path: X-Original-To: apmail-manifoldcf-commits-archive@www.apache.org Delivered-To: apmail-manifoldcf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 465EDE1DF for ; Fri, 1 Feb 2013 15:14:03 +0000 (UTC) Received: (qmail 74388 invoked by uid 500); 1 Feb 2013 15:14:03 -0000 Delivered-To: apmail-manifoldcf-commits-archive@manifoldcf.apache.org Received: (qmail 74278 invoked by uid 500); 1 Feb 2013 15:14:00 -0000 Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@manifoldcf.apache.org Delivered-To: mailing list commits@manifoldcf.apache.org Received: (qmail 74253 invoked by uid 99); 1 Feb 2013 15:13:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 15:13:59 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 01 Feb 2013 15:13:58 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D83D22388847; Fri, 1 Feb 2013 15:13:39 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1441480 - in /manifoldcf/trunk: CHANGES.txt connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchSpecs.java Date: Fri, 01 Feb 2013 15:13:39 -0000 To: commits@manifoldcf.apache.org From: kwright@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130201151339.D83D22388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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); } }