Merge branch 'delete-notifications' of github.com:surevine/buddycloud-server-java

Author: Lloyd Watkin

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeDelete.java

@@ -1,5 +1,6 @@
 package org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.set;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.concurrent.BlockingQueue;
 
@@ -20,10 +21,12 @@
 import org.xmpp.packet.Packet;
 import org.xmpp.packet.PacketError;
 import org.xmpp.resultsetmanagement.ResultSet;
+import org.xmpp.resultsetmanagement.ResultSetImpl;
 
 public class NodeDelete extends PubSubElementProcessorAbstract {
 
     private static final String NODE_REG_EX = "^/user/[^@]+@[^/]+/[^/]+$";
+	private ResultSet<NodeSubscription> subscriptions;
 
     public NodeDelete(BlockingQueue<Packet> outQueue, ChannelManager channelManager) {
         setChannelManager(channelManager);
@@ -54,13 +57,21 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm) throws Exc
             outQueue.put(response);
             return;
         }
+        getNodeListeners();
         deleteNode();
         sendNotifications();
     }
 
-    private void sendNotifications() throws NodeStoreException {
+    private void getNodeListeners() {
+    	try {
+			subscriptions = channelManager.getNodeSubscriptionListeners(node);
+		} catch (NodeStoreException e) {
+			subscriptions = new ResultSetImpl<NodeSubscription>(new ArrayList<NodeSubscription>());
+		}
+	}
+
+	private void sendNotifications() throws NodeStoreException {
         try {
-            ResultSet<NodeSubscription> subscriptions = channelManager.getNodeSubscriptionListeners(node);
             Message notification = createNotificationMessage();
             if (subscriptions != null) {
                 for (NodeSubscription subscription : subscriptions) {

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGetTest.java

@@ -220,4 +220,5 @@ public void addsInvitedByToUserSubscriptionsListIfUser() throws Exception {
         Assert.assertEquals(1, response.getChildElement().element("subscriptions").elements("subscription").size());
 
     }
+
 }

src/test/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/NodeDeleteTest.java

@@ -8,6 +8,7 @@
 
 import org.buddycloud.channelserver.Configuration;
 import org.buddycloud.channelserver.channel.ChannelManager;
+import org.buddycloud.channelserver.db.exception.NodeStoreException;
 import org.buddycloud.channelserver.packetHandler.iq.IQTestHandler;
 import org.buddycloud.channelserver.pubsub.affiliation.Affiliations;
 import org.buddycloud.channelserver.pubsub.model.NodeSubscription;
@@ -284,4 +285,30 @@ public void testSuccessfulDeleteWithSubscribers() throws Exception {
         Assert.assertEquals(node,
                 eventEl.element("delete").attributeValue("node"));
     }
+    
+    @Test
+    public void databaseExceptionWhenGettingListenersSendsMinimalNotifications() throws Exception {
+        IQ request = readStanzaAsIq("/iq/pubsub/delete/request-with-node.stanza");
+        Element deleteEl = request.getChildElement().element("delete");
+
+        String node = deleteEl.attributeValue("node");
+        Mockito.when(channelManager.nodeExists(node)).thenReturn(true);
+
+        Mockito.doThrow(new NodeStoreException()).when(channelManager)
+            .getNodeSubscriptionListeners(Mockito.anyString());
+        
+        Mockito.when(channelManager.getNodeMembership(node, jid)).thenReturn(
+                new NodeMembershipImpl(node, jid, Subscriptions.subscribed,
+                        Affiliations.owner, null));
+
+        nodeDelete.process(deleteEl, jid, request, null);
+        IQ response = (IQ) queue.poll();
+
+        Assert.assertNull(response.getError());
+        Assert.assertEquals(request.getID(), response.getID());
+        Assert.assertEquals(Type.result, response.getType());
+
+        int adminCount = Configuration.getInstance().getAdminUsers().size();
+        Assert.assertEquals(adminCount, queue.size());
+    }
 }