couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject chttpd commit: updated refs/heads/master to d31b2a4
Date Sun, 20 Dec 2015 18:39:46 GMT
Repository: couchdb-chttpd
Updated Branches:
  refs/heads/master 3ff69bffd -> d31b2a4d4


fix conflict case - COUCHDB-2082


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/d31b2a4d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/d31b2a4d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/d31b2a4d

Branch: refs/heads/master
Commit: d31b2a4d44d68f8e9a1ac2c55c47e0cf4e95397b
Parents: 3ff69bf
Author: Robert Newson <rnewson@apache.org>
Authored: Sun Dec 20 18:39:36 2015 +0000
Committer: Robert Newson <rnewson@apache.org>
Committed: Sun Dec 20 18:39:36 2015 +0000

----------------------------------------------------------------------
 src/chttpd_auth_cache.erl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/d31b2a4d/src/chttpd_auth_cache.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_auth_cache.erl b/src/chttpd_auth_cache.erl
index 74ee77d..8a64ae7 100644
--- a/src/chttpd_auth_cache.erl
+++ b/src/chttpd_auth_cache.erl
@@ -206,6 +206,6 @@ update_doc_ignoring_conflict(DbName, Doc, Options) ->
     try
         fabric:update_doc(DbName, Doc, Options)
     catch
-        error:conflict ->
+        throw:conflict ->
             ok
     end.


Mime
View raw message