Return-Path: Delivered-To: apmail-lucene-solr-commits-archive@minotaur.apache.org Received: (qmail 46236 invoked from network); 18 Jun 2009 08:59:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 18 Jun 2009 08:59:58 -0000 Received: (qmail 40808 invoked by uid 500); 18 Jun 2009 09:00:09 -0000 Delivered-To: apmail-lucene-solr-commits-archive@lucene.apache.org Received: (qmail 40754 invoked by uid 500); 18 Jun 2009 09:00:09 -0000 Mailing-List: contact solr-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: solr-dev@lucene.apache.org Delivered-To: mailing list solr-commits@lucene.apache.org Received: (qmail 40745 invoked by uid 99); 18 Jun 2009 09:00:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 18 Jun 2009 09:00:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Thu, 18 Jun 2009 09:00:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 14E662388891; Thu, 18 Jun 2009 08:59:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r785965 - /lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Date: Thu, 18 Jun 2009 08:59:46 -0000 To: solr-commits@lucene.apache.org From: noble@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090618085947.14E662388891@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: noble Date: Thu Jun 18 08:59:46 2009 New Revision: 785965 URL: http://svn.apache.org/viewvc?rev=785965&view=rev Log: SOLR-1228 Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Modified: lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java URL: http://svn.apache.org/viewvc/lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java?rev=785965&r1=785964&r2=785965&view=diff ============================================================================== --- lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java (original) +++ lucene/solr/trunk/contrib/dataimporthandler/src/main/java/org/apache/solr/handler/dataimport/DocBuilder.java Thu Jun 18 08:59:46 2009 @@ -272,6 +272,20 @@ Iterator> iter = deletedKeys.iterator(); while (iter.hasNext()) { Map map = iter.next(); + Object key = null; + if(root.pk != null){ + key = map.get(root.pk); + } + if(key == null && map.size() ==1){ + for (Map.Entry e : map.entrySet()) { + key = e.getValue(); + break; + } + } + if(key == null) { + LOG.warn("no key was available for deleteted pk query"); + continue; + } writer.deleteDoc(map.get(root.pk)); importStatistics.deletedDocCount.incrementAndGet(); iter.remove();