Fix to handle errors correctly

leo-project · Feb 12, 2014 · 63a1dbb · 63a1dbb
1 parent d95e0ee
commit 63a1dbb
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/leo_gateway_http_commons.erl b/src/leo_gateway_http_commons.erl
@@ -350,11 +350,17 @@ move_large_object(#metadata{dsize = Size}, DstKey,
                        ReadHandler) ->
     {ok, WriteHandler}  = leo_gateway_large_object_handler:start_link(DstKey, ChunkedSize),
     try
-        move_large_object_1(leo_gateway_large_object_handler:get_chunked(ReadHandler),
+        case move_large_object_1(leo_gateway_large_object_handler:get_chunked(ReadHandler),
                                 #req_large_obj{handler       = WriteHandler,
                                                key           = DstKey,
                                                length        = Size,
-                                               chunked_size  = ChunkedSize}, ReadHandler)
+                                               chunked_size  = ChunkedSize}, ReadHandler) of
+            {error, Cause} ->
+                ok = leo_gateway_large_object_handler:rollback(WriteHandler),
+                {error, Cause};
+            Other ->
+                Other
+        end
     after
         catch leo_gateway_large_object_handler:stop(WriteHandler)
     end.
@@ -375,7 +381,6 @@ move_large_object_1({ok, Data},
 move_large_object_1({error, Cause}, 
                     #req_large_obj{key = Key,
                                    handler = WriteHandler}, _) ->
-    ok = leo_gateway_large_object_handler:rollback(WriteHandler),
     ?error("move_large_object_1/3", "key:~s, cause:~p", [binary_to_list(Key), Cause]),
     {error, ?ERROR_FAIL_RETRIEVE_OBJ};
 move_large_object_1(done, #req_large_obj{handler = WriteHandler,