diff options
| author | Jan Lehnardt <jan@apache.org> | 2009-11-30 19:10:08 +0000 |
|---|---|---|
| committer | Jan Lehnardt <jan@apache.org> | 2009-11-30 19:10:08 +0000 |
| commit | a6d71c3b4e8f4a5a59e66999bd504753f5810bb6 (patch) | |
| tree | 78143fd08219870f4d583033013220f37ae50b88 /src/couchdb/couch_doc.erl | |
| parent | b232effb7b51c831c0eccfb553514bd2b0c41c0b (diff) | |
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
Diffstat (limited to 'src/couchdb/couch_doc.erl')
| -rw-r--r-- | src/couchdb/couch_doc.erl | 6 |
1 files changed, 3 insertions, 3 deletions
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, [])). |