From 54a0ca5247f9bcffaf349f28022957708a2a2e1f Mon Sep 17 00:00:00 2001 From: Denny Sheirer Date: Wed, 16 Oct 2024 02:59:55 -0400 Subject: [PATCH] #2020 P25 channel null frequency band error. (#2021) Co-authored-by: Dennis Sheirer --- .../decode/p25/identifier/channel/APCO25Channel.java | 7 ++++++- .../module/decode/p25/identifier/channel/P25Channel.java | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java index 17fe2b74..2ab7209e 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/APCO25Channel.java @@ -135,7 +135,12 @@ public class APCO25Channel extends Identifier implements IChannelDes } P25Channel decoratedChannel = new P25Channel(existing.getBandIdentifier(), channelNumber); - decoratedChannel.setFrequencyBand(existing.getFrequencyBand()); + + if(existing.getFrequencyBand() != null) + { + decoratedChannel.setFrequencyBand(existing.getFrequencyBand()); + } + return new APCO25Channel(decoratedChannel); } diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java index 90c582b1..9d3ea616 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/identifier/channel/P25Channel.java @@ -134,7 +134,7 @@ public class P25Channel implements IChannelDescriptor @Override public void setFrequencyBand(IFrequencyBand frequencyBand) { - if(frequencyBand.getIdentifier() == getDownlinkBandIdentifier()) + if(frequencyBand != null && frequencyBand.getIdentifier() == getDownlinkBandIdentifier()) { mFrequencyBand = frequencyBand; }