From 91cae70fa10fb0ac6f3e6caabf98bfc852e66089 Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Thu, 7 May 2020 08:30:07 +0000 Subject: [PATCH] #799 resolves npe in alias hasBroadcastChannels() method (#802) Co-authored-by: Denny --- src/main/java/io/github/dsheirer/alias/Alias.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/io/github/dsheirer/alias/Alias.java b/src/main/java/io/github/dsheirer/alias/Alias.java index 2b75a1e1..53abb627 100644 --- a/src/main/java/io/github/dsheirer/alias/Alias.java +++ b/src/main/java/io/github/dsheirer/alias/Alias.java @@ -618,10 +618,14 @@ public class Alias for(AliasID id : getAliasIdentifiers()) { - if(id.getType() == AliasIDType.BROADCAST_CHANNEL && - ((BroadcastChannel)id).getChannelName().contentEquals(channel)) + if(id instanceof BroadcastChannel) { - return true; + BroadcastChannel broadcastChannel = (BroadcastChannel)id; + + if(broadcastChannel.getChannelName() != null && broadcastChannel.getChannelName().contentEquals(channel)) + { + return true; + } } }