Improved logging. Do not reuse old subscription if affiliation is none.

Author: abmargb

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

@@ -9,7 +9,6 @@
 import org.apache.log4j.Logger;
 import org.buddycloud.channelserver.channel.ChannelManager;
 import org.buddycloud.channelserver.channel.Conf;
-import org.buddycloud.channelserver.db.NodeStore.Transaction;
 import org.buddycloud.channelserver.db.exception.NodeStoreException;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.JabberPubsub;
 import org.buddycloud.channelserver.packetprocessor.iq.namespace.pubsub.PubSubElementProcessorAbstract;
@@ -130,16 +129,18 @@ public void process(Element elm, JID actorJID, IQ reqIQ, Element rsm)
 			Affiliations defaultAffiliation = null;
 			Subscriptions defaultSubscription = null;
 
-			if (!possibleExistingSubscription.in(Subscriptions.none)) {
+			if (!possibleExistingSubscription.in(Subscriptions.none) && 
+					!possibleExistingAffiliation.in(Affiliations.none)) {
 				LOGGER.debug("User already has a '"
 						+ possibleExistingSubscription.toString()
 						+ "' subscription");
 				defaultAffiliation = possibleExistingAffiliation;
 				defaultSubscription = possibleExistingSubscription;
 			} else {
 				try {
-					defaultAffiliation = Affiliations.createFromString(nodeConf
-							.get(Conf.DEFAULT_AFFILIATION));
+					String nodeDefAffiliation = nodeConf.get(Conf.DEFAULT_AFFILIATION);
+					LOGGER.debug("Node default affiliation: '" + nodeDefAffiliation + "'");
+					defaultAffiliation = Affiliations.createFromString(nodeDefAffiliation);
 				} catch (NullPointerException e) {
 					LOGGER.error("Could not create affiliation.", e);
 					defaultAffiliation = Affiliations.member;