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

Omaha #3267 fixed collaboration NPE possibility

Browse source 
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: d49a03a269 [formerly 667cda6c19] [formerly 42e6e38c2e] [formerly 42e6e38c2e [formerly adbffa5ddd]] [formerly d49a03a269 [formerly 667cda6c19] [formerly 42e6e38c2e] [formerly 42e6e38c2e [formerly adbffa5ddd]] [formerly 91eb7d40c2 [formerly 42e6e38c2e [formerly adbffa5ddd] [formerly 91eb7d40c2 [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]]]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 645a24a1c1 [formerly 54081d0255] [formerly b1fac777f4] [formerly 4ddb772e9c3f68cdf8f65972f4c26bfaa496e290 [formerly 6dcce07d15edffe9b65d033992c7dff4c59bc36b] [formerly b1fac777f4 [formerly 3bdbf79eeb]]]
Former-commit-id: ca2147ae12b473309e3c5fecd5059553defc608f [formerly 0299c53f7e72fd336d2e410db8f9ab7456ee054d] [formerly 338f293065 [formerly e13aeb0ca5]]
Former-commit-id: 338f293065
Former-commit-id: 547bad711a
This commit is contained in:
Brian Clements 2014-06-12 15:05:46 -05:00
parent 8f85a62a91
commit 1397ffb9d7
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/com.raytheon.uf.viz.collaboration.ui/src/com/raytheon/uf/viz/collaboration/ui/UsersTreeLabelProvider.java
View file

@ -63,6 +63,7 @@ import com.raytheon.uf.viz.collaboration.ui.data.SessionGroupContainer;
* Feb 13, 2014 2751 bclement made AbstractUsersLabelProvider generic
* Feb 17, 2014 2751 bclement added block image logic to userLabelProvider
* Mar 06, 2014 2848 bclement get venueName directly from session
* Jun 12, 2014 3267 bclement fixed missing null-check for outdated UI info
*
* </pre>
*
@ -122,7 +123,12 @@ public class UsersTreeLabelProvider extends ColumnLabelProvider {
if (!account.isSameUser(user)) {
ContactsManager cm = conn.getContactsManager();
RosterEntry entry = cm.getRosterEntry(user);
if (ContactsManager.isBlocked(entry)) {
/*
* if entry is null here, it means that the UI has an outdated
* roster entry, this will get resolved on the next refresh
* which is likely already starting to happen right now
*/
if (entry != null && ContactsManager.isBlocked(entry)) {
rval = true;
}
}