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

Merge "Omaha #3705 fixed collaboration public room empty participants list problem" into omaha_14.4.1

Browse source 
Former-commit-id: 10ebb35cb0 [formerly f6e9759779] [formerly 3d945c4772] [formerly 3e2e3761de [formerly 3d945c4772 [formerly 6ad3a9d449cbdc06d68335d49bb0ac5620585758]]]
Former-commit-id: 3e2e3761de
Former-commit-id: e01dd4f5bec05fefabc24208190339a06fce96c1 [formerly b1ea383f58]
Former-commit-id: eaae6c7e5e
This commit is contained in:
Nate Jensen 2014-11-13 09:45:21 -06:00 • committed by Gerrit Code Review
commit cc22850179
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/JoinRoomAction.java
View file

@ -48,7 +48,8 @@ import com.raytheon.viz.ui.views.CaveWorkbenchPageManager;
*
* Date Ticket# Engineer Description
* ------------ ---------- ----------- --------------------------
* Oct 8, 2014 3705 bclement Initial creation
* Oct 8, 2014 3705 bclement Initial creation
* Nov 12, 2014 3705 bclement fixed empty participant list problem
*
* </pre>
*
@ -106,11 +107,15 @@ public class JoinRoomAction extends Action {
try {
VenueSession session = connection.joinTextOnlyVenue(room,
handle);
/*
* connect to room before UI initializes so it gets the
* participant list
*/
session.connectToRoom();
CaveWorkbenchPageManager page = CaveWorkbenchPageManager
.getActiveInstance();
page.showView(SessionView.ID, session.getSessionId(),
IWorkbenchPage.VIEW_ACTIVATE);
session.connectToRoom();
} catch (CollaborationException | PartInitException e) {
log.error("Unable to join room " + room.getFQName(), e);
}