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

Merge pull request #185 from DSheirer/183-alias-list-throws-npe-on-empty-name

Browse Source 
Resolves #183 - alias list throws NPE when created with a null or emp…
This commit is contained in:
Denny Sheirer
2017-02-11 00:35:16 +00:00
committed by GitHub
parent 861203c3a0 2ca9e5d5ce
commit 9cc0d367a8
1 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/alias/AliasList.java
View File

@@ -631,36 +631,47 @@ public class AliasList implements Listener<AliasEvent>
return mName; return mName;
} }
/**
* Indicates if this alias list has a non-null, non-empty name
*/
private boolean hasName()
{
return mName != null && !mName.isEmpty();
}
/** /**
* Receive alias change event notifications and modify this list accordingly * Receive alias change event notifications and modify this list accordingly
*/ */
@Override @Override
public void receive(AliasEvent event) public void receive(AliasEvent event)
{ {
Alias alias = event.getAlias(); if(hasName())
switch(event.getEvent())
{ {
case ADD: Alias alias = event.getAlias();
if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
{ switch(event.getEvent())
addAlias(alias); {
} case ADD:
break; if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
case CHANGE: {
if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList())) addAlias(alias);
{ }
addAlias(alias); break;
} case CHANGE:
break; if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
case DELETE: {
if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList())) addAlias(alias);
{ }
removeAlias(alias); break;
} case DELETE:
break; if(alias.getList() != null && getName().equalsIgnoreCase(alias.getList()))
default: {
break; removeAlias(alias);
}
break;
default:
break;
}
} }
} }
} }