mirror of
https://github.com/processone/ejabberd.git
synced 2024-11-24 16:23:40 +01:00
Don't fail on PEP unsubscribe
Don't crash if a PEP node is explicitly unsubscribed. This fixes a
regression introduced by 45eb49125b
.
Thanks to Melvin Keskin for reporting the bug.
This commit is contained in:
parent
14c8e1226f
commit
7008ae231c
@ -128,7 +128,7 @@ subscribe_node(Nidx, Sender, Subscriber, AccessModel,
|
|||||||
unsubscribe_node(Nidx, Sender, Subscriber, SubId) ->
|
unsubscribe_node(Nidx, Sender, Subscriber, SubId) ->
|
||||||
case node_flat:unsubscribe_node(Nidx, Sender, Subscriber, SubId) of
|
case node_flat:unsubscribe_node(Nidx, Sender, Subscriber, SubId) of
|
||||||
{error, Error} -> {error, Error};
|
{error, Error} -> {error, Error};
|
||||||
{result, _} -> {result, []}
|
{result, _} -> {result, default}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
publish_item(Nidx, Publisher, Model, MaxItems, ItemId, Payload, PubOpts) ->
|
publish_item(Nidx, Publisher, Model, MaxItems, ItemId, Payload, PubOpts) ->
|
||||||
|
@ -85,7 +85,7 @@ subscribe_node(Nidx, Sender, Subscriber, AccessModel,
|
|||||||
unsubscribe_node(Nidx, Sender, Subscriber, SubId) ->
|
unsubscribe_node(Nidx, Sender, Subscriber, SubId) ->
|
||||||
case node_flat_sql:unsubscribe_node(Nidx, Sender, Subscriber, SubId) of
|
case node_flat_sql:unsubscribe_node(Nidx, Sender, Subscriber, SubId) of
|
||||||
{error, Error} -> {error, Error};
|
{error, Error} -> {error, Error};
|
||||||
{result, _} -> {result, []}
|
{result, _} -> {result, default}
|
||||||
end.
|
end.
|
||||||
|
|
||||||
publish_item(Nidx, Publisher, Model, MaxItems, ItemId, Payload, PubOpts) ->
|
publish_item(Nidx, Publisher, Model, MaxItems, ItemId, Payload, PubOpts) ->
|
||||||
|
Loading…
Reference in New Issue
Block a user