couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kocol...@apache.org
Subject svn commit: r911718 - in /couchdb/branches/0.11.x: ./ etc/default/couchdb src/couchdb/couch_rep.erl
Date Fri, 19 Feb 2010 07:07:50 GMT
Author: kocolosk
Date: Fri Feb 19 07:07:50 2010
New Revision: 911718

URL: http://svn.apache.org/viewvc?rev=911718&view=rev
Log:
keep listeners when rebooting replications

This fixes the problem where rebooted replications would crash at the end with
a badmatch on [] in do_terminate.

Modified:
    couchdb/branches/0.11.x/   (props changed)
    couchdb/branches/0.11.x/etc/default/couchdb   (props changed)
    couchdb/branches/0.11.x/src/couchdb/couch_rep.erl

Propchange: couchdb/branches/0.11.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 19 07:07:50 2010
@@ -6,4 +6,4 @@
 /couchdb/branches/list-iterator:782292-784593
 /couchdb/branches/tail_header:775760-778477
 /couchdb/tags/0.10.0:825400
-/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602
+/couchdb/trunk:909247,910054,910696,910910-910911,911544,911559,911578,911602,911717

Propchange: couchdb/branches/0.11.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 19 07:07:50 2010
@@ -6,5 +6,5 @@
 /couchdb/branches/list-iterator/etc/default/couchdb:782292-784593
 /couchdb/branches/tail_header/etc/default/couchdb:775760-778477
 /couchdb/tags/0.10.0/etc/default/couchdb:825400
-/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602
+/couchdb/trunk/etc/default/couchdb:909247,910054,910696,911544,911602,911717
 /incubator/couchdb/trunk/etc/default/couchdb:642419-694440

Modified: couchdb/branches/0.11.x/src/couchdb/couch_rep.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/couchdb/couch_rep.erl?rev=911718&r1=911717&r2=911718&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/couchdb/couch_rep.erl (original)
+++ couchdb/branches/0.11.x/src/couchdb/couch_rep.erl Fri Feb 19 07:07:50 2010
@@ -604,7 +604,7 @@
         close_db(Target),
         close_db(Source),
         {ok, NewState} = init(State#state.init_args),
-        NewState
+        NewState#state{listeners=State#state.listeners}
     end.
 
 commit_to_both(Source, Target, RequiredSeq) ->



Mime
View raw message