- Simplify delivery log message

- Use warning instead of error

3 files changed, 15 insertions, 8 deletions

diff --git a/src/org/traccar/smpp/ClientSmppSessionHandler.java b/src/org/traccar/smpp/ClientSmppSessionHandler.java
index 2cf03871c..721243f9f 100644
--- a/src/org/traccar/smpp/ClientSmppSessionHandler.java
+++ b/src/org/traccar/smpp/ClientSmppSessionHandler.java
@@ -43,11 +43,18 @@ public class ClientSmppSessionHandler extends DefaultSmppSessionHandler {
         PduResponse response = null;
         try {
             if (request instanceof DeliverSm) {
-                Log.debug("Message Received: "
-                        + CharsetUtil.decode(((DeliverSm) request).getShortMessage(),
-                        smppClient.mapDataCodingToCharset(((DeliverSm) request).getDataCoding()))
-                        + ", Source Address: "
-                        + ((DeliverSm) request).getSourceAddress().getAddress());
+                if (request.getOptionalParameters() != null) {
+                    Log.debug("Message Delivered: "
+                            + request.getOptionalParameter(SmppConstants.TAG_RECEIPTED_MSG_ID).getValueAsString()
+                            + ", State: "
+                            + request.getOptionalParameter(SmppConstants.TAG_MSG_STATE).getValueAsByte());
+                } else {
+                    Log.debug("Message Received: "
+                            + CharsetUtil.decode(((DeliverSm) request).getShortMessage(),
+                            smppClient.mapDataCodingToCharset(((DeliverSm) request).getDataCoding()))
+                            + ", Source Address: "
+                            + ((DeliverSm) request).getSourceAddress().getAddress());
+                }
             }
             response = request.createResponse();
         } catch (Throwable error) {
diff --git a/src/org/traccar/smpp/EnquireLinkTask.java b/src/org/traccar/smpp/EnquireLinkTask.java
index 22347b6f4..9a3121e24 100644
--- a/src/org/traccar/smpp/EnquireLinkTask.java
+++ b/src/org/traccar/smpp/EnquireLinkTask.java
@@ -43,13 +43,13 @@ public class EnquireLinkTask implements Runnable {
                 smppSession.enquireLink(new EnquireLink(), enquireLinkTimeout);
             } catch (SmppTimeoutException | SmppChannelException
                     | RecoverablePduException | UnrecoverablePduException error) {
-                Log.warning("Enquire link failed, executing reconnect: " + error);
+                Log.warning("Enquire link failed, executing reconnect: ", error);
                 smppClient.reconnect();
             } catch (InterruptedException error) {
                 Log.info("Enquire link interrupted, probably killed by reconnecting");
             }
         } else {
-            Log.error("Enquire link running while session is not connected");
+            Log.warning("Enquire link running while session is not connected");
         }
     }
 
diff --git a/src/org/traccar/smpp/SmppClient.java b/src/org/traccar/smpp/SmppClient.java
index a1d56c2bf..b93253de4 100644
--- a/src/org/traccar/smpp/SmppClient.java
+++ b/src/org/traccar/smpp/SmppClient.java
@@ -193,7 +193,7 @@ public class SmppClient {
             submit.setSourceAddress(new Address(sourceTon, sourceNpi, sourceAddress));
             submit.setDestAddress(new Address(destTon, destNpi, destAddress));
             submit.setRegisteredDelivery(SmppConstants.REGISTERED_DELIVERY_SMSC_RECEIPT_REQUESTED);
-            submit.setDataCoding((byte) dataCoding);
+            submit.setDataCoding(dataCoding);
             submit.setShortMessage(textBytes);
             SubmitSmResp submitResponce = getSession().submit(submit, submitTimeout);
             Log.debug("SMS submited, msg_id: " + submitResponce.getMessageId());