GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Resolves #682 NPE when logging channel events with no alias list specified. (#683)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-03-20 15:15:53 +00:00
committed by GitHub
parent a7c28f066a
commit 1c6f91f101
1 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/io/github/dsheirer/module/log/DecodeEventLogger.java
View File

@@ -114,11 +114,20 @@ public class DecodeEventLogger extends EventLogger implements IDecodeEventListen
if(toIdentifiers != null && !toIdentifiers.isEmpty())
{
Identifier identifier = event.getIdentifierCollection().getIdentifier(IdentifierClass.CONFIGURATION,Form.ALIAS_LIST,Role.ANY);
Identifier identifier = event.getIdentifierCollection()
.getIdentifier(IdentifierClass.CONFIGURATION,Form.ALIAS_LIST,Role.ANY);
mAliasList = mAliasModel.getAliasList((AliasListConfigurationIdentifier)identifier);
String mystring = (!mAliasList.getAliases(toIdentifiers.get(0)).isEmpty()) ? mAliasList.getAliases(toIdentifiers.get(0)).get(0).toString() : "";
sb.append(",\"").append(mystring).append(" (").append(toIdentifiers.get(0)).append(")\"");
if(mAliasList != null)
{
String mystring = (!mAliasList.getAliases(toIdentifiers.get(0)).isEmpty()) ?
mAliasList.getAliases(toIdentifiers.get(0)).get(0).toString() : "";
sb.append(",\"").append(mystring).append(" (").append(toIdentifiers.get(0)).append(")\"");
}
else
{
sb.append(",\"\"");
}
}
else
{
@@ -129,11 +138,13 @@ public class DecodeEventLogger extends EventLogger implements IDecodeEventListen
sb.append(",\"").append(descriptor != null ? descriptor : "").append("\"");
Identifier frequency = event.getIdentifierCollection().getIdentifier(IdentifierClass.CONFIGURATION, Form.CHANNEL_FREQUENCY, Role.ANY);
Identifier frequency = event.getIdentifierCollection()
.getIdentifier(IdentifierClass.CONFIGURATION, Form.CHANNEL_FREQUENCY, Role.ANY);
if(frequency instanceof FrequencyConfigurationIdentifier)
{
sb.append(",\"").append(mFrequencyFormat.format(((FrequencyConfigurationIdentifier)frequency).getValue() / 1e6d)).append("\"");
sb.append(",\"").append(mFrequencyFormat
.format(((FrequencyConfigurationIdentifier)frequency).getValue() / 1e6d)).append("\"");
}
else
{