You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by no...@apache.org on 2010/06/15 07:15:46 UTC

svn commit: r954709 - in /lucene/solr/branches/branch-1.4: CHANGES.txt src/java/org/apache/solr/handler/ReplicationHandler.java

Author: noble
Date: Tue Jun 15 05:15:45 2010
New Revision: 954709

URL: http://svn.apache.org/viewvc?rev=954709&view=rev
Log:
SOLR-1769 Solr 1.4 Replication - Repeater throwing NullPointerException

Modified:
    lucene/solr/branches/branch-1.4/CHANGES.txt
    lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/ReplicationHandler.java

Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=954709&r1=954708&r2=954709&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Tue Jun 15 05:15:45 2010
@@ -137,6 +137,8 @@ Bug Fixes
   values which are Collections or other classes that implement
   Iterable. (noble, hossman)
 
+* SOLR-1769 Solr 1.4 Replication - Repeater throwing NullPointerException (noble)
+
 ================== Release 1.4.0 ==================
 Release Date:  See http://lucene.apache.org/solr for the official release date.
 

Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=954709&r1=954708&r2=954709&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/ReplicationHandler.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/handler/ReplicationHandler.java Tue Jun 15 05:15:45 2010
@@ -919,7 +919,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());
           }