Commit e9aea579 authored by Dave Cridland's avatar Dave Cridland

Merge pull request #228 from Redor/openfire

Private Storage should return an error if feature is disabled
parents 8b95f440 2d2a3be4
...@@ -28,6 +28,7 @@ import org.jivesoftware.openfire.XMPPServer; ...@@ -28,6 +28,7 @@ import org.jivesoftware.openfire.XMPPServer;
import org.jivesoftware.openfire.auth.UnauthorizedException; import org.jivesoftware.openfire.auth.UnauthorizedException;
import org.jivesoftware.openfire.disco.ServerFeaturesProvider; import org.jivesoftware.openfire.disco.ServerFeaturesProvider;
import org.xmpp.packet.IQ; import org.xmpp.packet.IQ;
import org.xmpp.packet.PacketError;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
...@@ -87,8 +88,14 @@ public class IQPrivateHandler extends IQHandler implements ServerFeaturesProvide ...@@ -87,8 +88,14 @@ public class IQPrivateHandler extends IQHandler implements ServerFeaturesProvide
child.add(dataStored); child.add(dataStored);
} }
else { else {
privateStorage.add(packet.getFrom().getNode(), dataElement); replyPacket = IQ.createResultIQ(packet);
replyPacket = IQ.createResultIQ(packet);
if (privateStorage.isEnabled()) {
privateStorage.add(packet.getFrom().getNode(), dataElement);
} else {
replyPacket.setChildElement(packet.getChildElement().createCopy());
replyPacket.setError(PacketError.Condition.service_unavailable);
}
} }
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment