xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2797 fixed presence bug

Browse source 
a defensive copy was needed when sending presence to rooms


Former-commit-id: 23e2039028 [formerly 81ddf87b04 [formerly d0dab4bce76b45b71f4238d5a04c440cee936eaf]]
Former-commit-id: 81ddf87b04
Former-commit-id: 22031aa87d
This commit is contained in:
Brian Clements 2014-02-12 16:53:00 -06:00
parent 6611c70839
commit b8a1c8f56d
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.uf.viz.collaboration.comm/src/com/raytheon/uf/viz/collaboration/comm/provider/session/AccountManager.java
View file

@ -41,6 +41,7 @@ import com.raytheon.uf.viz.collaboration.comm.identity.IVenueSession;
import com.raytheon.uf.viz.collaboration.comm.identity.event.IRosterChangeEvent;
import com.raytheon.uf.viz.collaboration.comm.identity.event.RosterChangeType;
import com.raytheon.uf.viz.collaboration.comm.identity.roster.ISubscriptionResponder;
import com.raytheon.uf.viz.collaboration.comm.provider.Tools;
import com.raytheon.uf.viz.collaboration.comm.provider.event.RosterChangeEvent;
import com.raytheon.uf.viz.collaboration.comm.provider.event.UserPresenceChangedEvent;
import com.raytheon.uf.viz.collaboration.comm.provider.user.ContactsManager;
@ -67,6 +68,7 @@ import com.raytheon.uf.viz.collaboration.comm.provider.user.UserId;
* Jan 07, 2013 2563 bclement fixed id parsing in auto responder
* Jan 27, 2014 2700 bclement changes to subscription request responders
* Jan 31, 2014 2700 bclement fixed subscribe back after accepting subscription
* Feb 12, 2014 2797 bclement added protective copy to sendPresence
*
* </pre>
*
@ -299,7 +301,7 @@ public class AccountManager implements IAccountManager {
}
/**
*
* broadcast new presence to server
*
* @param userPresence
* @throws CollaborationException
@ -307,19 +309,23 @@ public class AccountManager implements IAccountManager {
@Override
public void sendPresence(Presence userPresence)
throws CollaborationException {
userPresence.setTo(null);
sessionManager.getXmppConnection().sendPacket(userPresence);
sessionManager.setPresence(userPresence);
for (ISession session : sessionManager.getSessions()) {
if (session instanceof IVenueSession) {
((IVenueSession) session).sendPresence(userPresence);
Presence copy = new Presence(userPresence.getType(),
userPresence.getStatus(), userPresence.getPriority(),
userPresence.getMode());
Tools.copyProperties(userPresence, copy);
((IVenueSession) session).sendPresence(copy);
}
}
sessionManager.postEvent(new UserPresenceChangedEvent(userPresence));
}
/**
*
* send presence to specific address
*
* @param userPresence
* @throws CollaborationException