From a6d71c3b4e8f4a5a59e66999bd504753f5810bb6 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Mon, 30 Nov 2009 19:10:08 +0000 Subject: Fix two issues for databases upgraded from 0.9.x: - Compaction would fail. - GET /db/doc?attachments=true would generate a 500. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@885542 13f79535-47bb-0310-9956-ffa450edef68 --- src/couchdb/couch_doc.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/couchdb/couch_doc.erl') diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl index d0c2918a..bdefb95c 100644 --- a/src/couchdb/couch_doc.erl +++ b/src/couchdb/couch_doc.erl @@ -285,9 +285,9 @@ att_to_iolist(#att{data=Bin}) when is_binary(Bin) -> Bin; att_to_iolist(#att{data=Iolist}) when is_list(Iolist) -> Iolist; -att_to_iolist(#att{data={Fd,Sp},md5=Md5}) -> - lists:reverse(couch_stream:foldl(Fd, Sp, Md5, - fun(Bin,Acc) -> [Bin|Acc] end, [])); +att_to_iolist(#att{data={Fd,Sp}}=Att) -> + lists:reverse(att_foldl(Att, + fun(Bin,Acc) -> [Bin|Acc] end, [])); att_to_iolist(#att{data=DataFun, len=Len}) when is_function(DataFun)-> lists:reverse(fold_streamed_data(DataFun, Len, fun(Data, Acc) -> [Data | Acc] end, [])). -- cgit v1.2.3