From 895067f71e82e9c6f5cf1ee6536badb87a5c0a2d Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 12 Sep 2015 11:42:26 -0400 Subject: [PATCH] Resolved issue with duplicate Do Not Monitor events being sent to the call event panel. --- src/module/decode/state/TrafficChannelManager.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/module/decode/state/TrafficChannelManager.java b/src/module/decode/state/TrafficChannelManager.java index d79c2f85..c551ce24 100644 --- a/src/module/decode/state/TrafficChannelManager.java +++ b/src/module/decode/state/TrafficChannelManager.java @@ -10,7 +10,6 @@ import module.decode.config.DecodeConfiguration; import module.decode.event.CallEvent; import module.decode.event.CallEvent.CallEventType; import module.decode.event.ICallEventProvider; -import module.decode.mpt1327.MPT1327CallEvent; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -175,6 +174,8 @@ public class TrafficChannelManager extends Module /* Check the from/to aliases for do not monitor priority */ if( isDoNotMonitor( callEvent ) ) { + callEvent.setCallEventType( CallEventType.CALL_DO_NOT_MONITOR ); + if( isSameCallEvent( mPreviousDoNotMonitorCallEvent, callEvent ) ) { return; @@ -182,7 +183,6 @@ public class TrafficChannelManager extends Module else { mPreviousDoNotMonitorCallEvent = callEvent; - callEvent.setCallEventType( CallEventType.CALL_DO_NOT_MONITOR ); } } else if( frequency > 0 ) @@ -236,9 +236,12 @@ public class TrafficChannelManager extends Module */ public static boolean isSameCallEvent( CallEvent e1, CallEvent e2 ) { - if( e1 == null || - e2 == null || - e1.getCallEventType() != e2.getCallEventType() ) + if( e1 == null || e2 == null ) + { + return false; + } + + if( e1.getCallEventType() != e2.getCallEventType() ) { return false; }