Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 69776 invoked from network); 31 Mar 2010 10:07:43 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 31 Mar 2010 10:07:43 -0000 Received: (qmail 79954 invoked by uid 500); 31 Mar 2010 10:07:43 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 79822 invoked by uid 500); 31 Mar 2010 10:07:41 -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 79815 invoked by uid 99); 31 Mar 2010 10:07:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 31 Mar 2010 10:07:40 +0000 X-ASF-Spam-Status: No, hits=-999.5 required=10.0 tests=ALL_TRUSTED,AWL,FS_REPLICA 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; Wed, 31 Mar 2010 10:07:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id E53392388903; Wed, 31 Mar 2010 10:07:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r929454 - in /lucene/dev/trunk/solr: CHANGES.txt src/java/org/apache/solr/handler/ReplicationHandler.java Date: Wed, 31 Mar 2010 10:07:18 -0000 To: java-commits@lucene.apache.org From: noble@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100331100718.E53392388903@eris.apache.org> Author: noble Date: Wed Mar 31 10:07:18 2010 New Revision: 929454 URL: http://svn.apache.org/viewvc?rev=929454&view=rev Log: SOLR-1853 Solr 1.4 Replication - Repeater throwing NullPointerException Modified: lucene/dev/trunk/solr/CHANGES.txt lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java Modified: lucene/dev/trunk/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=929454&r1=929453&r2=929454&view=diff ============================================================================== --- lucene/dev/trunk/solr/CHANGES.txt (original) +++ lucene/dev/trunk/solr/CHANGES.txt Wed Mar 31 10:07:18 2010 @@ -124,6 +124,8 @@ New Features * SOLR-1379: Add RAMDirectoryFactory for non-persistent in memory index storage. (Alex Baranov via yonik) +* SOLR-1769: Solr 1.4 Replication - Repeater throwing NullPointerException (Jörgen Rydenius via noble) + Optimizations ---------------------- Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=929454&r1=929453&r2=929454&view=diff ============================================================================== --- lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java (original) +++ lucene/dev/trunk/solr/src/java/org/apache/solr/handler/ReplicationHandler.java Wed Mar 31 10:07:18 2010 @@ -920,7 +920,9 @@ public class ReplicationHandler extends if (getCommit) { IndexCommit oldCommitPoint = indexCommitPoint; indexCommitPoint = core.getDeletionPolicy().getLatestCommit(); - core.getDeletionPolicy().saveCommitPoint(indexCommitPoint.getVersion()); + if (indexCommitPoint != null) { + core.getDeletionPolicy().saveCommitPoint(indexCommitPoint.getVersion()); + } if(oldCommitPoint != null){ core.getDeletionPolicy().releaseCommitPoint(oldCommitPoint.getVersion()); }