Merge pull request #207 from DSheirer/206-alias-list-npe-null-list-name

206 alias list npe null list name
Incrementing build to beta 6
2026-11-10 23:57:25 -05:00 · 2017-02-24 10:25:29 +00:00 · 2017-02-24 05:24:38 -05:00 · 2017-02-24 05:23:48 -05:00
2 changed files with 2 additions and 2 deletions
--- a/build/build.xml
+++ b/build/build.xml
@@ -7,7 +7,7 @@
  <property name="major" value="0"/>
  <property name="minor" value="3"/>
  <property name="patch" value="0"/>
-  <property name="release" value="-beta5"/>
+  <property name="release" value="-beta6"/>
  <property name="filename" value="sdrtrunk_${major}.${minor}.${patch}${release}"/>
    
  <!-- Build properties -->
--- a/src/alias/AliasModel.java
+++ b/src/alias/AliasModel.java
@@ -82,7 +82,7 @@ public class AliasModel extends AbstractTableModel
        {
            for(Alias alias : mAliases)
            {
-                if(alias.getList().equalsIgnoreCase(name))
+                if(alias.hasList() && alias.getList().equalsIgnoreCase(name))
                {
                    aliasList.addAlias(alias);
                }
Author	SHA1	Message	Date
Denny Sheirer	8827ecd0e9	Merge pull request #207 from DSheirer/206-alias-list-npe-null-list-name 206 alias list npe null list name	2017-02-24 10:25:29 +00:00
Denny	8660002f93	Incrementing build to beta 6	2017-02-24 05:24:38 -05:00
Denny	2058fcbc1d	Resolves issue #206 - alias list throws NPE on aliases that don't have a list name specified.	2017-02-24 05:23:48 -05:00