Merge pull request #287 from buddycloud/federation_issues

Fixing some issues with fields hiding other fields

Author: ashward

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/SubscriptionsGet.java

@@ -21,22 +21,15 @@
 
 public class SubscriptionsGet extends PubSubElementProcessorAbstract {
 
-    private final BlockingQueue<Packet> outQueue;
-    private ChannelManager channelManager;
-
     private IQ result;
     private String node;
     private JID actorJid;
     private IQ requestIq;
     private boolean ephemeral = false;
 
     public SubscriptionsGet(BlockingQueue<Packet> outQueue, ChannelManager channelManager) {
-        this.outQueue = outQueue;
-        this.channelManager = channelManager;
-    }
-
-    public void setChannelManager(ChannelManager dataStore) {
-        channelManager = dataStore;
+        setOutQueue(outQueue);
+        setChannelManager(channelManager);
     }
 
 

src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/get/items/NodeItemsGet.java

@@ -36,8 +36,6 @@ public class NodeItemsGet extends PubSubElementProcessorAbstract {
 
     public static final int MAX_ITEMS_TO_RETURN = 50;
 
-    private final BlockingQueue<Packet> outQueue;
-
     private ChannelManager channelManager;
     private String node;
     private String firstItem;
@@ -56,7 +54,7 @@ public class NodeItemsGet extends PubSubElementProcessorAbstract {
     private JID actor;
 
     public NodeItemsGet(BlockingQueue<Packet> outQueue, ChannelManager channelManager) {
-        this.outQueue = outQueue;
+        setOutQueue(outQueue);
         setChannelManager(channelManager);
 
         this.acceptedElementName = XMLConstants.ITEMS_ELEM;

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

@@ -45,11 +45,10 @@ public class SubscribeSet extends PubSubElementProcessorAbstract {
 
   public static final String INVALID_NODE_FORMAT = "invalid-node-format";
 
-  private final BlockingQueue<Packet> outQueue;
   private final ChannelManager channelManager;
 
   public SubscribeSet(BlockingQueue<Packet> outQueue, ChannelManager channelManager) {
-    this.outQueue = outQueue;
+    this.setOutQueue(outQueue);
     this.channelManager = channelManager;
 
     acceptedElementName = XMLConstants.SUBSCRIBE_ELEM;