diff options
author | Parveen Kumar Yadav <parveenkumardeeva@gmail.com> | 2018-04-13 10:47:42 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-13 10:47:42 +0530 |
commit | d448823edd0e8a7833c79b980cfe9778b849843a (patch) | |
tree | 50ad1ab51b93915cff422a1834baa5a2c579fce8 /src/org/traccar/smpp/ClientSmppSessionHandler.java | |
parent | 2c8392a0e16044905d983da56ab0919eadbb3858 (diff) | |
parent | 617393cf9f052298f7fb35f0c58138c87a6dd5c3 (diff) | |
download | traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.gz traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.tar.bz2 traccar-server-d448823edd0e8a7833c79b980cfe9778b849843a.zip |
Merge pull request #1 from traccar/master
Bringing Fork Up to Date
Diffstat (limited to 'src/org/traccar/smpp/ClientSmppSessionHandler.java')
-rw-r--r-- | src/org/traccar/smpp/ClientSmppSessionHandler.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/org/traccar/smpp/ClientSmppSessionHandler.java b/src/org/traccar/smpp/ClientSmppSessionHandler.java index 69ef9af41..3585f8376 100644 --- a/src/org/traccar/smpp/ClientSmppSessionHandler.java +++ b/src/org/traccar/smpp/ClientSmppSessionHandler.java @@ -50,7 +50,14 @@ public class ClientSmppSessionHandler extends DefaultSmppSessionHandler { smppClient.mapDataCodingToCharset(((DeliverSm) request).getDataCoding())); Log.debug("SMS Message Received: " + message.trim() + ", Source Address: " + sourceAddress); - if (!SmppUtil.isMessageTypeAnyDeliveryReceipt(((DeliverSm) request).getEsmClass())) { + boolean isDeliveryReceipt = false; + if (smppClient.getDetectDlrByOpts()) { + isDeliveryReceipt = request.getOptionalParameters() != null; + } else { + isDeliveryReceipt = SmppUtil.isMessageTypeAnyDeliveryReceipt(((DeliverSm) request).getEsmClass()); + } + + if (!isDeliveryReceipt) { TextMessageEventHandler.handleTextMessage(sourceAddress, message); } } |