Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 45084 invoked from network); 21 Feb 2010 11:21:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 21 Feb 2010 11:21:04 -0000 Received: (qmail 39064 invoked by uid 500); 21 Feb 2010 11:21:04 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 38991 invoked by uid 500); 21 Feb 2010 11:21:04 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 38982 invoked by uid 99); 21 Feb 2010 11:21:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Feb 2010 11:21:04 +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; Sun, 21 Feb 2010 11:20:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 6E37623888C2; Sun, 21 Feb 2010 11:20:33 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r912331 - /lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java Date: Sun, 21 Feb 2010 11:20:33 -0000 To: java-commits@lucene.apache.org From: uschindler@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100221112033.6E37623888C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: uschindler Date: Sun Feb 21 11:20:33 2010 New Revision: 912331 URL: http://svn.apache.org/viewvc?rev=912331&view=rev Log: LUCENE-2273: add additional null check Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java Modified: lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java URL: http://svn.apache.org/viewvc/lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=912331&r1=912330&r2=912331&view=diff ============================================================================== --- lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java (original) +++ lucene/java/trunk/src/java/org/apache/lucene/search/FieldCacheImpl.java Sun Feb 21 11:20:33 2010 @@ -76,6 +76,7 @@ synchronized(cache.readerCache) { for (final Map.Entry> readerCacheEntry : cache.readerCache.entrySet()) { final Object readerKey = readerCacheEntry.getKey(); + if (readerKey == null) continue; final Map innerCache = readerCacheEntry.getValue(); for (final Map.Entry mapEntry : innerCache.entrySet()) { Entry entry = mapEntry.getKey();