summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthew Sackman <matthew@lshift.net>2009-06-23 17:30:06 +0100
committerMatthew Sackman <matthew@lshift.net>2009-06-23 17:30:06 +0100
commit3b867a0119b14e84b6edb65dadaa54349c2cded3 (patch)
tree2e2d2ed3f0f6b14c0c56c2038ba2e3c4983acaea /src
parentd2d83a73310a420656fad07007ba5a14a74938e2 (diff)
parent9bcdac9c76c5049c57fa510156dbe9f96a635320 (diff)
downloadrabbitmq-server-git-3b867a0119b14e84b6edb65dadaa54349c2cded3.tar.gz
merging in fix from 20470
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_disk_queue.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl
index 26d0c8dcce..d161a09349 100644
--- a/src/rabbit_disk_queue.erl
+++ b/src/rabbit_disk_queue.erl
@@ -739,6 +739,8 @@ start_commit_timer(State = #dqstate { timer_ref = undefined }) ->
{ok, TRef} = timer:apply_after(?SYNC_INTERVAL, ?MODULE, filesync, []),
State #dqstate { timer_ref = TRef }.
+stop_commit_timer(State = #dqstate { timer_ref = undefined }) ->
+ State;
stop_commit_timer(State = #dqstate { timer_ref = TRef }) ->
{ok, cancel} = timer:cancel(TRef),
State #dqstate { timer_ref = undefined }.