[couchdb] 04/05: Fix response protocol

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch optimize-ddoc-cache
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit d07f7fe83502b79c52f988d3e7f407ec748b0c83
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Jun 19 12:34:30 2017 -0500

    Fix response protocol
---
 src/ddoc_cache/src/ddoc_cache_entry.erl  | 8 ++------
 src/ddoc_cache/src/ddoc_cache_opener.erl | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/ddoc_cache/src/ddoc_cache_entry.erl b/src/ddoc_cache/src/ddoc_cache_entry.erl
index a1bcb3a..80b8659 100644
--- a/src/ddoc_cache/src/ddoc_cache_entry.erl
+++ b/src/ddoc_cache/src/ddoc_cache_entry.erl
@@ -52,12 +52,8 @@ handle_resp(Else) ->
 open(Key) ->
     {_Pid, Ref} = erlang:spawn_monitor(?MODULE, do_open, [Key]),
     receive
-        {'DOWN', Ref, _, _, {open_ok, Key, Resp}} ->
-            Resp;
-        {'DOWN', Ref, _, _, {open_error, Key, Class, Reason, Stack}} ->
-            erlang:raise(Class, Reason, Stack);
-        {'DOWN', Ref, _, _, Other} ->
-            erlang:error({ddoc_cache_entry, Other})
+        {'DOWN', Ref, _, _, Resp} ->
+            handle_resp(Resp)
     end.
 
 
diff --git a/src/ddoc_cache/src/ddoc_cache_opener.erl b/src/ddoc_cache/src/ddoc_cache_opener.erl
index 904c36f..f6a4438 100644
--- a/src/ddoc_cache/src/ddoc_cache_opener.erl
+++ b/src/ddoc_cache/src/ddoc_cache_opener.erl
@@ -102,7 +102,7 @@ handle_cast(Msg, St) ->
 
 
 handle_info({'EXIT', _Pid, {open_ok, OpenerKey, Resp}}, St) ->
-    respond(OpenerKey, {open_ok, Resp}),
+    respond(OpenerKey, {open_ok, OpenerKey, Resp}),
     {noreply, St};
 
 handle_info({'EXIT', _Pid, {open_error, OpenerKey, Type, Reason, Stack}}, St) ->

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.