diff options
author | Micael Karlberg <[email protected]> | 2011-11-16 10:19:55 +0100 |
---|---|---|
committer | Micael Karlberg <[email protected]> | 2011-11-16 10:19:55 +0100 |
commit | 2b05cc74d7f5000f70fc05d5bb964fe38f8d620c (patch) | |
tree | e3e0f4d1f0b679cf3c64fc38507e3903c3d90641 /lib/snmp/src/misc | |
parent | b5a96738a6fb010f08d9cf5abdc1b2c3a50f0b6b (diff) | |
parent | 2541d05f29853e479fe078d5d5169ea16558291f (diff) | |
download | otp-2b05cc74d7f5000f70fc05d5bb964fe38f8d620c.tar.gz otp-2b05cc74d7f5000f70fc05d5bb964fe38f8d620c.tar.bz2 otp-2b05cc74d7f5000f70fc05d5bb964fe38f8d620c.zip |
Merge commit 'build/maint-r14/2011-11-14_22.10' into maint-r14
Diffstat (limited to 'lib/snmp/src/misc')
-rw-r--r-- | lib/snmp/src/misc/snmp_note_store.erl | 15 |
1 files changed, 11 insertions, 4 deletions
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. |