Overwrite defaultAffiliation if we already have one. Fixes #69.

Author: Lloyd Watkin

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

@@ -155,6 +155,9 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 						subscribingJid, request.getFrom(), defaultSubscription);
 				channelManager.addUserSubscription(newSubscription);
 
+				if (null != possibleExistingAffiliation) {
+					defaultAffiliation = possibleExistingAffiliation;
+				}
 				channelManager.setUserAffiliation(node, subscribingJid,
 						defaultAffiliation);
 			}