Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-05-07 02:52:58 +0000
committerslewis2007-05-07 02:52:58 +0000
commit6913adee69dda8f9f37b3c3905d8819e0304a6eb (patch)
tree5c55b243a36f7310709fd845a55b720ef81b4661
parente26f9b2a07b659fd73691aa50889f1f392eaac90 (diff)
downloadorg.eclipse.ecf-6913adee69dda8f9f37b3c3905d8819e0304a6eb.tar.gz
org.eclipse.ecf-6913adee69dda8f9f37b3c3905d8819e0304a6eb.tar.xz
org.eclipse.ecf-6913adee69dda8f9f37b3c3905d8819e0304a6eb.zip
Fix for NPE in select for IRosterEntry
-rw-r--r--framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
index 41645b86d..3439f7507 100644
--- a/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
+++ b/framework/bundles/org.eclipse.ecf.presence.ui/src/org/eclipse/ecf/presence/ui/MultiRosterView.java
@@ -134,7 +134,10 @@ public class MultiRosterView extends ViewPart implements IMultiRosterViewPart {
public boolean select(Viewer viewer, Object parentElement,
Object element) {
if (element instanceof IRosterEntry) {
- return ((IRosterEntry) element).getPresence().getType() != IPresence.Type.UNAVAILABLE;
+ IRosterEntry entry = (IRosterEntry) element;
+ IPresence presence = entry.getPresence();
+ if (presence != null) return (presence.getType() != IPresence.Type.UNAVAILABLE);
+ else return true;
} else {
return true;
}

Back to the top