From commits-return-7141-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Sat Oct 29 15:41:10 2011 Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8720D9C16 for ; Sat, 29 Oct 2011 15:41:10 +0000 (UTC) Received: (qmail 83523 invoked by uid 500); 29 Oct 2011 15:41:10 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 83482 invoked by uid 500); 29 Oct 2011 15:41:10 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 83475 invoked by uid 99); 29 Oct 2011 15:41:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Oct 2011 15:41:10 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.114] (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 29 Oct 2011 15:41:08 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3BED6546CB; Sat, 29 Oct 2011 15:40:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jan@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: git commit: Gracefully handle "doc_ids"=null in doc id replication filter option. Message-Id: <20111029154047.3BED6546CB@tyr.zones.apache.org> Date: Sat, 29 Oct 2011 15:40:47 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Updated Branches: refs/heads/master 02e808ae1 -> bea76dbf5 Gracefully handle "doc_ids"=null in doc id replication filter option. Closes COUCHDB-1248 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bea76dbf Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bea76dbf Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bea76dbf Branch: refs/heads/master Commit: bea76dbf523498890a9d59df5d6712ac9374a219 Parents: 02e808a Author: Jan Lehnardt Authored: Sat Oct 29 17:39:51 2011 +0200 Committer: Jan Lehnardt Committed: Sat Oct 29 17:39:51 2011 +0200 ---------------------------------------------------------------------- src/couchdb/couch_replicator_utils.erl | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/bea76dbf/src/couchdb/couch_replicator_utils.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_replicator_utils.erl b/src/couchdb/couch_replicator_utils.erl index 07630e7..6cc4db8 100644 --- a/src/couchdb/couch_replicator_utils.erl +++ b/src/couchdb/couch_replicator_utils.erl @@ -251,6 +251,8 @@ convert_options([{<<"filter">>, V} | R]) -> [{filter, V} | convert_options(R)]; convert_options([{<<"query_params">>, V} | R]) -> [{query_params, V} | convert_options(R)]; +convert_options([{<<"doc_ids">>, null} | R]) -> + convert_options(R); convert_options([{<<"doc_ids">>, V} | R]) -> % Ensure same behaviour as old replicator: accept a list of percent % encoded doc IDs.