lucene-commits mailing list archives

Author: shalin
Date: Mon Sep 26 07:21:57 2011
New Revision: 1175703

URL: http://svn.apache.org/viewvc?rev=1175703&view=rev
Log:
SOLR-2791 -- Replication: abortfetch command is broken if replication was started by fetchindex
command instead of a regular poll.

Modified:
    lucene/dev/branches/branch_3x/   (props changed)
    lucene/dev/branches/branch_3x/lucene/   (props changed)
    lucene/dev/branches/branch_3x/lucene/backwards/src/test/   (props changed)
    lucene/dev/branches/branch_3x/solr/   (props changed)
    lucene/dev/branches/branch_3x/solr/CHANGES.txt
    lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java

Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1175703&r1=1175702&r2=1175703&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Mon Sep 26 07:21:57 2011
@@ -62,6 +62,9 @@ Bug Fixes
 * SOLR-2780: Fixed issue where multi select facets didn't respect group.truncate parameter.
   (Martijn van Groningen, Ramzi Alqrainy)
 
+* SOLR-2791: Replication: abortfetch command is broken if replication was started
+  by fetchindex command instead of a regular poll (Yury Kats via shalin)
+
  Other Changes
 ----------------------
 

Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java?rev=1175703&r1=1175702&r2=1175703&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
(original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
Mon Sep 26 07:21:57 2011
@@ -167,8 +167,9 @@ public class ReplicationHandler extends 
         rsp.add("message","No slave configured");
       }
     } else if (command.equalsIgnoreCase(CMD_ABORT_FETCH)) {
-      if (snapPuller != null){
-        snapPuller.abortPull();
+      SnapPuller temp = tempSnapPuller;
+      if (temp != null){
+        temp.abortPull();
         rsp.add(STATUS, OK_STATUS);
       } else {
         rsp.add(STATUS,ERR_STATUS);