| Chunk |
|---|
| Conflicting content |
|---|
// Check that the requesting user is allowed to unsubscribe according to
// XEP-0060 section 6.2.3.3
<<<<<<< HEAD
if (!unsubscribingJid.equals(membership.getUser())) {
response.setType(Type.error);
PacketError pe = new PacketError(
org.xmpp.packet.PacketError.Condition.forbidden,
org.xmpp.packet.PacketError.Type.auth);
response.setError(pe);
=======
if (false == unsubscribingJid.equals(existingSubscription.getUser())) {
createExtendedErrorReply(
PacketError.Type.auth,
PacketError.Condition.forbidden,
CAN_NOT_UNSUBSCRIBE_ANOTHER_USER,
Buddycloud.NS
);
>>>>>>> 2a31c3e625f9e8a36335815c776c4bbac5aa1e15
outQueue.put(response);
return;
} |
| Solution content |
|---|
// Check that the requesting user is allowed to unsubscribe according to
// XEP-0060 section 6.2.3.3
if (!unsubscribingJid.equals(membership.getUser())) {
response.setType(Type.error);
PacketError pe = new PacketError(
org.xmpp.packet.PacketError.Condition.forbidden,
org.xmpp.packet.PacketError.Type.auth);
response.setError(pe);
outQueue.put(response);
return;
} |
| File |
|---|
| UnsubscribeSet.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Method invocation |
| Variable |