Resolves issue with Null Pointer exception in alias list

This commit is contained in:
Denny
2017-02-20 20:19:47 -05:00
parent 17c7466c6b
commit 234e313b7a

View File

@@ -17,6 +17,12 @@
******************************************************************************/
package alias;
import alias.AliasEvent.Event;
import alias.id.broadcast.BroadcastChannel;
import sample.Broadcaster;
import sample.Listener;
import javax.swing.table.AbstractTableModel;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -24,13 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CopyOnWriteArrayList;
import javax.swing.table.AbstractTableModel;
import alias.id.broadcast.BroadcastChannel;
import sample.Broadcaster;
import sample.Listener;
import alias.AliasEvent.Event;
/**
* Alias Model
*/
@@ -72,13 +71,15 @@ public class AliasModel extends AbstractTableModel
public AliasList getAliasList(String name)
{
if( mAliasListMap.containsKey( name ) )
if(name != null && mAliasListMap.containsKey(name))
{
return mAliasListMap.get(name);
}
AliasList aliasList = new AliasList(name);
if(name != null)
{
for(Alias alias : mAliases)
{
if(alias.getList().equalsIgnoreCase(name))
@@ -91,6 +92,7 @@ public class AliasModel extends AbstractTableModel
//Register the new alias list to receive updates from this model
addListener(aliasList);
}
return aliasList;
}
@@ -213,6 +215,7 @@ public class AliasModel extends AbstractTableModel
/**
* Renames any broadcast channels that have the previous name.
*
* @param previousName to rename
* @param newName to assign to the broadcast channel
*/