From 334e0ea11f8740a1102ab8411a959cf8b364eb4d Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Wed, 25 Aug 2010 13:28:38 +0200
Subject: Fix a bug that could cause the net_kernel process to crash.

A bug introduced in kernel-2.13.5.3 has been fixed. If running
net_kernel:set_net_ticktime/1 twice within the TransitionPerod the
second call caused the net_kernel process to crash with a badmatch.
---
 lib/kernel/src/net_kernel.erl              | 4 ++--
 lib/kernel/test/erl_distribution_SUITE.erl | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/src/net_kernel.erl b/lib/kernel/src/net_kernel.erl
index 1353ac65c6..9875044844 100644
--- a/lib/kernel/src/net_kernel.erl
+++ b/lib/kernel/src/net_kernel.erl
@@ -500,8 +500,8 @@ handle_call({new_ticktime,T,TP}, From, #state{tick = #tick{ticker = Tckr,
                                                  time = T,
                                                  how = How}}}, From);
 
-handle_call({new_ticktime,From,_},
-	    _,
+handle_call({new_ticktime,_T,_TP},
+	    From,
 	    #state{tick = #tick_change{time = T}} = State) ->
     async_reply({reply, {ongoing_change_to, T}, State}, From).
 
diff --git a/lib/kernel/test/erl_distribution_SUITE.erl b/lib/kernel/test/erl_distribution_SUITE.erl
index d15f6aa0d5..21a96f804a 100644
--- a/lib/kernel/test/erl_distribution_SUITE.erl
+++ b/lib/kernel/test/erl_distribution_SUITE.erl
@@ -273,6 +273,7 @@ tick_change(Config) when is_list(Config) ->
     ?line PaDir = filename:dirname(code:which(?MODULE)),
     ?line [BN, CN] = get_nodenames(2, tick_change),
     ?line DefaultTT = net_kernel:get_net_ticktime(),
+    ?line unchanged = net_kernel:set_net_ticktime(DefaultTT, 60),
     ?line case DefaultTT of
 	      I when is_integer(I) -> ?line ok;
 	      _                 -> ?line ?t:fail(DefaultTT)
@@ -377,6 +378,7 @@ run_tick_change_test(B, C, PrevTT, TT, PaDir) ->
     end,
 
     ?line change_initiated = net_kernel:set_net_ticktime(TT,20),
+    ?line {ongoing_change_to,_} = net_kernel:set_net_ticktime(TT,20),
     ?line sleep(3),
     ?line change_initiated = rpc:call(B,net_kernel,set_net_ticktime,[TT,15]),
     ?line sleep(7),
-- 
cgit v1.2.3


From f673a2e5b4ae4bb2c3ecf4716b5e34b394cc4c08 Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Wed, 1 Sep 2010 17:20:36 +0200
Subject: Prepare release

---
 lib/kernel/doc/src/notes.xml | 17 +++++++++++++++++
 lib/kernel/vsn.mk            |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'lib/kernel')

diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index aa652020d9..5467cd8cde 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -30,6 +30,23 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 2.13.5.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>A bug introduced in kernel-2.13.5.3 has been fixed. If
+	    running <c>net_kernel:set_net_ticktime/1</c> twice within
+	    the <c>TransitionPerod</c> the second call caused the
+	    net_kernel process to crash with a <c>badmatch</c>.</p>
+          <p>
+	    Own Id: OTP-8787 Aux Id: seq11657, OTP-8643 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 2.13.5.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index ff195f6334..933600b501 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 2.13.5.3
+KERNEL_VSN = 2.13.5.4
-- 
cgit v1.2.3