summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Romain <christophe.romain@process-one.net>2009-05-12 20:57:38 +0000
committerChristophe Romain <christophe.romain@process-one.net>2009-05-12 20:57:38 +0000
commit257efddd1b9764a4e9abce9bdf94e2dffc33db5a (patch)
treeede91a80754d76f0e34747b4c6aae0d949bc7e38
parentPrevent race condition when calling get_caps while note_caps has not been han... (diff)
Fix bad transaction returncode in unsubscribe presence handler
SVN Revision: 2073
-rw-r--r--ChangeLog5
-rw-r--r--src/mod_pubsub/mod_pubsub.erl4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index cb67ce5a..00e57e41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-12 Christophe Romain <christophe.romain@process-one.net>
+
+ * src/mod_pubsub/mod_pubsub.erl: Fix bad transaction returncode in
+ unsubscribe presence handler
+
2009-05-11 Christophe Romain <christophe.romain@process-one.net>
* src/mod_caps.erl: Prevent race condition when calling get_caps while
diff --git a/src/mod_pubsub/mod_pubsub.erl b/src/mod_pubsub/mod_pubsub.erl
index fa021cc7..df009d8d 100644
--- a/src/mod_pubsub/mod_pubsub.erl
+++ b/src/mod_pubsub/mod_pubsub.erl
@@ -728,10 +728,10 @@ handle_cast({unsubscribe, Subscriber, Owner}, State) ->
true ->
node_call(Type, unsubscribe_node, [NodeId, Subscriber, JID, all]);
false ->
- ok
+ {result, ok}
end;
_ ->
- ok
+ {result, ok}
end
end,
transaction(Host, Node, Action, sync_dirty);