From 3cccaf3fc16d51c6b8194277ac7e746ac7932741 Mon Sep 17 00:00:00 2001
From: "dennis.sheirer" <dennis.sheirer@gmail.com>
Date: Tue, 2 Dec 2014 01:56:15 +0000
Subject: [PATCH] Resolved issue with recent change to SiteID Alias handling
 causing a problem in the MPT1327 channel state.

---
 src/decode/mpt1327/MPT1327ChannelState.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/decode/mpt1327/MPT1327ChannelState.java b/src/decode/mpt1327/MPT1327ChannelState.java
index 091e2690..a5696e95 100644
--- a/src/decode/mpt1327/MPT1327ChannelState.java
+++ b/src/decode/mpt1327/MPT1327ChannelState.java
@@ -17,6 +17,9 @@
  ******************************************************************************/
 package decode.mpt1327;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import message.Message;
 import sample.Listener;
 import source.config.SourceConfigTuner;
@@ -36,6 +39,8 @@ import decode.mpt1327.MPT1327Message.IdentType;
 
 public class MPT1327ChannelState extends ChannelState
 {
+	private final static Logger mLog = LoggerFactory.getLogger( MPT1327ChannelState.class );
+
 	private String mSite;
 	private String mFromTalkgroup;
 	private String mToTalkgroup;
@@ -153,13 +158,18 @@ public class MPT1327ChannelState extends ChannelState
 									.build() );
 						break;
 					case ALH:
-						String sys = mpt.getSiteID();
+						String site = mpt.getSiteID();
 						
-						if( sys != null && !sys.contentEquals( mSite ) )
+						if( mSite == null )
 						{
-							mSite = sys;
+							mSite = site;
+						}
+						else if( site != null && !site.contentEquals( mSite ) )
+						{
+							mSite = site;
 							broadcastChange( ChangedAttribute.CHANNEL_SITE_NUMBER  );
 						}
+						
 						setState( State.CONTROL );
 						break;
 					case GTC: