Merge pull request #84 from surevine/master

lloydwatkin · lloydwatkin · commit 40895a2c8db8 · 2013-11-07T09:12:31.000-08:00
Overwrite defaultAffiliation if we already have one. Fixes #69.
diff --git a/src/main/java/org/buddycloud/channelserver/packetprocessor/iq/namespace/pubsub/set/SubscribeSet.java b/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);
 			}

Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,9 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)`
`155`	`155`	`subscribingJid, request.getFrom(), defaultSubscription);`
`156`	`156`	`channelManager.addUserSubscription(newSubscription);`
`157`	`157`
	`158`	`+ if (null != possibleExistingAffiliation) {`
	`159`	`+ defaultAffiliation = possibleExistingAffiliation;`
	`160`	`+ }`
`158`	`161`	`channelManager.setUserAffiliation(node, subscribingJid,`
`159`	`162`	`defaultAffiliation);`
`160`	`163`	`}`