fix: correct handling pdu requests

MikeSafonov · Jul 22, 2020 · 1c3830a · 1c3830a
1 parent 5775834
commit 1c3830a
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/main/java/com/github/mikesafonov/smpp/core/reciever/ResponseSmppSessionHandler.java b/src/main/java/com/github/mikesafonov/smpp/core/reciever/ResponseSmppSessionHandler.java
@@ -35,21 +35,19 @@ public ResponseSmppSessionHandler(String clientId, @NotNull List<DeliveryReportC
 
     @Override
     public PduResponse firePduRequestReceived(PduRequest pduRequest) {
-
-        if (pduRequest != null) {
-            if (isDelivery(pduRequest)) {
-                return processReport(pduRequest);
-            }
-            log.debug(pduRequest.toString());
+        log.debug(pduRequest.toString());
+        if (isDelivery(pduRequest)) {
+            processReport(pduRequest);
         }
-        return super.firePduRequestReceived(pduRequest);
+
+        return pduRequest.createResponse();
     }
 
     private boolean isDelivery(PduRequest pduRequest) {
         return pduRequest.isRequest() && pduRequest.getClass() == DeliverSm.class;
     }
 
-    private PduResponse processReport(PduRequest pduRequest) {
+    private void processReport(PduRequest pduRequest) {
         DeliverSm dlr = (DeliverSm) pduRequest;
         try {
             DeliveryReport report = toReport(dlr);
@@ -59,7 +57,6 @@ private PduResponse processReport(PduRequest pduRequest) {
         } catch (DeliveryReceiptException e) {
             log.error(e.getMessage(), e);
         }
-        return dlr.createResponse();
     }
 
     private DeliveryReport toReport(DeliverSm deliverSm) throws DeliveryReceiptException {