Replace 'decode_obj_msg' with 'decode_bin_obj'.

Author: ian-mi

src/riak_repl2_fssink.erl

@@ -148,8 +148,9 @@ handle_info({Proto, Socket, Data},
         State=#state{socket=Socket,transport=Transport}) when Proto==tcp; Proto==ssl ->
     %% aae strategy will not receive messages here
     Transport:setopts(Socket, [{active, once}]),
-    case riak_repl_util:decode_obj_msg(Data) of
-        {fs_diff_obj, RObj} ->
+    case binary_to_term(Data) of
+        {fs_diff_obj, BinObj} ->
+            RObj = riak_repl_util:decode_bin_obj(BinObj),
             riak_repl_util:do_repl_put(RObj);
         Other ->
             gen_fsm:send_event(State#state.fullsync_worker, Other)

src/riak_repl_util.erl

@@ -56,7 +56,7 @@
          sockname/2,
          deduce_wire_version_from_proto/1,
          encode_obj_msg/2,
-         decode_obj_msg/1,
+         decode_bin_obj/1,
          make_pg_proxy_name/1,
          make_pg_name/1,
          mode_12_enabled/1,
@@ -892,20 +892,8 @@ encode_obj(w0, RObj) ->
 encode_obj(W, RObj) ->
     to_wire(W, RObj).
 
-decode_obj_msg(Data) ->
-    Msg = binary_to_term(Data),
-    case Msg of
-        {fs_diff_obj, BObj} when is_binary(BObj) ->
-            RObj = from_wire(BObj),
-            {fs_diff_obj, RObj};
-        {fs_diff_obj, {BTHash, BObj}} when is_binary(BObj) ->
-            RObj = from_wire(BObj),
-            {fs_diff_obj, {BTHash, RObj}};
-        {fs_diff_obj, _} ->
-            Msg;
-        Other ->
-            Other
-    end.
+decode_bin_obj({BTHash, BinObj}) -> {BTHash, from_wire(BinObj)};
+decode_bin_obj(BinObj) -> from_wire(BinObj).
 
 %% @doc Create binary wire formatted replication blob for riak 2.0+, complete with
 %%      possible type, bucket and key for reconstruction on the other end. BinObj should be