CDR on message rejection corrections

Conflicts: core/slee/services/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbb.java
RestComm · Jul 5, 2017 · 8bf713d · 8bf713d
1 parent fca4b51
commit 8bf713d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/http/server/tx/TxHttpServerSbb.java b/...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/http/server/tx/TxHttpServerSbb.java
@@ -632,7 +632,9 @@ protected SendMessageParseResult createSmsEventMultiDest(HttpSendMessageIncoming
                 succAddr = true;
             } catch (SmscProcessingException e) {
                 logger.severe("SmscProcessingException while processing message to destination: " + address, e);
-                generateCDR(incomingData, CdrGenerator.CDR_SUBMIT_FAILED_HTTP, e.getMessage(), true);
+                if (smscPropertiesManagement.isGenerateRejectionCdr()) {
+                    generateCDR(incomingData, CdrGenerator.CDR_SUBMIT_FAILED_HTTP, e.getMessage(), true);
+                }
             }
 
             if (succAddr) {

diff --git a/...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbb.java b/...s/sbbs/src/main/java/org/mobicents/smsc/slee/services/smpp/server/tx/TxSmppServerSbb.java
@@ -691,7 +691,6 @@ private void onSubmitMultiLocal(final TxSmppServerSbbUsage anSbbUsage, final com
                             event.getSourceAddress().getNpi(), event.getDestAddress().getAddress(),
                             event.getDestAddress().getTon(), event.getDestAddress().getNpi(),
                             CdrGenerator.CDR_SUBMIT_FAILED_ESME, e1.getMessage(), true);
-                    generateCDR(null, CdrGenerator.CDR_SUBMIT_FAILED_ESME, e1.getMessage(), false, true);
                 }
             }
             SubmitMultiResp response = event.createResponse();
@@ -732,14 +731,13 @@ private void onSubmitMultiLocal(final TxSmppServerSbbUsage anSbbUsage, final com
             smscStatAggregator.updateMsgInFailedAll();
             if (smscPropertiesManagement.isGenerateRejectionCdr()) {
                 if (singleSms != null) {
+                    generateCDR(singleSms, CdrGenerator.CDR_SUBMIT_FAILED_ESME, e1.getMessage(), false, true);
+                } else {
                     generateCDR(parseShortMessageText(event), esme.getNetworkId(), esme.getSystemId(),
                             event.getSourceAddress().getAddress(), event.getSourceAddress().getTon(),
                             event.getSourceAddress().getNpi(), event.getDestAddress().getAddress(),
                             event.getDestAddress().getTon(), event.getDestAddress().getNpi(),
                             CdrGenerator.CDR_SUBMIT_FAILED_ESME, e1.getMessage(), true);
-                    generateCDR(singleSms, CdrGenerator.CDR_SUBMIT_FAILED_ESME, e1.getMessage(), false, true);
-                } else {
-                    generateCDR(null, CdrGenerator.CDR_SUBMIT_FAILED_ESME, e1.getMessage(), false, true);
                 }
             }
             SubmitMultiResp response = event.createResponse();