diff options
| author | Robert Newson <rnewson@apache.org> | 2011-05-30 12:47:56 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2011-05-30 12:47:56 +0000 |
| commit | 3c1a0d7e2c9adef4f8b20c9df205a86e5c0feefb (patch) | |
| tree | 953fab74c6571ee22e3c01ea7865f9a571e52476 /src/couchdb | |
| parent | e064893f3fd5460a94e77566328818cf84de3517 (diff) | |
| parent | 79f3866adc9289e66b6092e4bdda3198369e09e4 (diff) | |
tagging 1.1.0
git-svn-id: https://svn.apache.org/repos/asf/couchdb/tags/1.1.0@1129145 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb')
| -rw-r--r-- | src/couchdb/couch_rep.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/couchdb/couch_rep.erl b/src/couchdb/couch_rep.erl index fd323f7f..6e4295ea 100644 --- a/src/couchdb/couch_rep.erl +++ b/src/couchdb/couch_rep.erl @@ -84,8 +84,14 @@ end_replication({BaseId, Extension}) -> {error, not_found} = R -> R; ok -> - ok = supervisor:delete_child(couch_rep_sup, RepId), - {ok, {cancelled, ?l2b(BaseId)}} + case supervisor:delete_child(couch_rep_sup, RepId) of + ok -> + {ok, {cancelled, ?l2b(BaseId)}}; + {error, not_found} -> + {ok, {cancelled, ?l2b(BaseId)}}; + {error, _} = Error -> + Error + end end. start_replication(RepDoc, {BaseId, Extension}, UserCtx) -> |