From b27432ee4f0d0809ea668cd9e4fcb4f601652cbd Mon Sep 17 00:00:00 2001
From: Micael Karlberg <bmk@erlang.org>
Date: Wed, 9 Nov 2011 14:05:51 +0100
Subject: Bad note store GC timer deactivation. Wrong field in the state record
 was set (timeout instead active). Stefan Grundmann OTP-9690

---
 lib/snmp/src/misc/snmp_note_store.erl | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'lib/snmp/src/misc')

diff --git a/lib/snmp/src/misc/snmp_note_store.erl b/lib/snmp/src/misc/snmp_note_store.erl
index a21a6209f1..23fccf8a5f 100644
--- a/lib/snmp/src/misc/snmp_note_store.erl
+++ b/lib/snmp/src/misc/snmp_note_store.erl
@@ -258,10 +258,17 @@ code_change({down, _Vsn}, State, _Extra) ->
     {ok, NState};
 
 % upgrade
-code_change(_Vsn, State, _Extra) ->
+code_change(_Vsn, State0, _Extra) ->
     process_flag(trap_exit, true),
-    NState = restart_timer(State),
-    {ok, NState}.
+    State1 = 
+	case State0 of
+	    #state{timeout = false} ->
+		State0#state{timeout = ?timeout};
+	    _ ->
+		State0
+	end,
+    State2 = restart_timer(State1),
+    {ok, State2}.
 
 
 %%----------------------------------------------------------
@@ -282,7 +289,7 @@ deactivate_timer(#state{timer = Pid, active = true} = State) ->
     receive
 	deactivated -> ok
     end,
-    State#state{timeout = false};
+    State#state{active = false};
 deactivate_timer(State) ->
     State.
 
-- 
cgit v1.2.3