Merge tag 'OTP-19.0' into sverker/19/binary_to_atom-utf8-crash/ERL-474/OTP-14590

1 files changed, 15 insertions, 14 deletions

diff --git a/lib/common_test/src/ct_rpc.erl b/lib/common_test/src/ct_rpc.erl
index 03d95d1408..b4a0bc9d74 100644
--- a/lib/common_test/src/ct_rpc.erl
+++ b/lib/common_test/src/ct_rpc.erl
@@ -1,18 +1,19 @@
 %%
 %% %CopyrightBegin%
 %% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2016. All Rights Reserved.
 %% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
 %% 
 %% %CopyrightEnd%
 %%
@@ -80,7 +81,7 @@ app_node(App, [], _, _) ->
 app_node(App, _Candidates = [CandidateNode | Nodes], FailOnBadRPC, Cookie) -> 
     Cookie0 = set_the_cookie(Cookie),
     Result = rpc:call(CandidateNode, application, which_applications, []),
-    set_the_cookie(Cookie0),
+    _ = set_the_cookie(Cookie0),
     case Result of
 	{badrpc,Reason} when FailOnBadRPC == true ->
 	    ct:fail({Reason,CandidateNode});
@@ -144,7 +145,7 @@ call({Fun, FunArgs}, Module, Function, Args, TimeOut, Cookie) ->
 call(Node, Module, Function, Args, TimeOut, Cookie) when is_atom(Node) ->
     Cookie0 = set_the_cookie(Cookie),
     Result = rpc:call(Node, Module, Function, Args, TimeOut),
-    set_the_cookie(Cookie0),
+    _ = set_the_cookie(Cookie0),
     Result.    
 
 %%% @spec cast(Node, Module, Function, Args) -> ok
@@ -189,7 +190,7 @@ cast({Fun, FunArgs}, Module, Function, Args, Cookie) ->
 cast(Node, Module, Function, Args, Cookie) when is_atom(Node) ->
     Cookie0 = set_the_cookie(Cookie),
     true = rpc:cast(Node, Module, Function, Args),
-    set_the_cookie(Cookie0),
+    _ = set_the_cookie(Cookie0),
     ok.