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

Omaha #4238 null safety check if feed view temporarily exists in other perspectives

Browse source 
after logging out

Change-Id: I9bdfa86a1ae2d587cf3ad4487d0c6eae15f1ff25

Former-commit-id: 808ae0398b [formerly b915adf57c64e5b0cf5f856436c9a1f01098a897]
Former-commit-id: e078881789
This commit is contained in:
Nate Jensen 2015-03-10 18:38:41 -05:00
parent 168ea904ea
commit 7e899a1c08
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/actions/DisplayFeedAction.java
View file

@ -72,6 +72,7 @@ import com.raytheon.viz.ui.views.CaveWorkbenchPageManager;
* to display messages.
* Jun 16, 2014 3288 bclement feed venue configuration changes
* Oct 08, 2014 3705 bclement moved venue joining code to CollaborationConnection
* Mar 10, 2015 4238 njensen null check in getSessionId()
*
* </pre>
*
@ -109,12 +110,15 @@ public class DisplayFeedAction extends Action {
CollaborationConnection connection = CollaborationConnection
.getConnection();
String sessionId = null;
for (ISession session : connection.getSessions()) {
if (session instanceof IVenueSession) {
FeedVenueConfig config = FeedVenueConfigManager.getConfig();
if (((IVenueSession) session).getVenueName().equalsIgnoreCase(
config.getName())) {
sessionId = session.getSessionId();
// connection can be null in rare cases
if (connection != null) {
for (ISession session : connection.getSessions()) {
if (session instanceof IVenueSession) {
FeedVenueConfig config = FeedVenueConfigManager.getConfig();
if (((IVenueSession) session).getVenueName()
.equalsIgnoreCase(config.getName())) {
sessionId = session.getSessionId();
}
}
}
}