SubscribeSet: old affiliation shouldn't be used if == none.

abmargb · abmargb · commit 37a2da712a1d · 2013-11-27T17:29:50.000+01:00
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
@@ -165,7 +165,8 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 						defaultSubscription);
 				channelManager.addUserSubscription(newSubscription);
 
-				if (null != possibleExistingAffiliation) {
+				if (possibleExistingAffiliation != null && 
+						!possibleExistingAffiliation.in(Affiliations.none)) {
 					defaultAffiliation = possibleExistingAffiliation;
 				}
 				channelManager.setUserAffiliation(node, subscribingJid,

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,8 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)`
`165`	`165`	`defaultSubscription);`
`166`	`166`	`channelManager.addUserSubscription(newSubscription);`
`167`	`167`
`168`		`- if (null != possibleExistingAffiliation) {`
	`168`	`+ if (possibleExistingAffiliation != null &&`
	`169`	`+ !possibleExistingAffiliation.in(Affiliations.none)) {`
`169`	`170`	`defaultAffiliation = possibleExistingAffiliation;`
`170`	`171`	`}`
`171`	`172`	`channelManager.setUserAffiliation(node, subscribingJid,`