Extra fixes for issues RestComm#72, RestComm#76

vetss · Sep 28, 2017 · fc7d1df · fc7d1df
1 parent cbdb16d
commit fc7d1df
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 4 deletions.
diff --git a/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/ChildSbb.java b/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/ChildSbb.java
@@ -85,8 +85,6 @@ public abstract class ChildSbb extends USSDBaseSbb implements ChildInterface, Ch
 
 	protected static final UssdPropertiesManagement ussdPropertiesManagement = UssdPropertiesManagement.getInstance();
 
-    private static final String USSD_STRING_SEPARATOR = ",";
-
 	public ChildSbb(String loggerName) {
 		super(loggerName);
 	}
@@ -216,7 +214,11 @@ public void onUnstructuredSSResponse(UnstructuredSSResponse evt, ActivityContext
 
             if(state.isInitialized()){
                 String ussdString = evt.getUSSDString().getString(null);
-                state.setUssdString(state.getUssdString()+USSD_STRING_SEPARATOR+ussdString);
+                if (state.getUssdString() == null) {
+                    state.setUssdString(ussdString);
+                } else {
+                    state.setUssdString(state.getUssdString() + USSDCDRState.USSD_STRING_SEPARATOR + ussdString);
+                }
             }
 
 			this.sendUssdData(dialog);

diff --git a/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/USSDCDRState.java b/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/USSDCDRState.java
@@ -38,6 +38,8 @@
  */
 public class USSDCDRState implements Serializable {
 
+    public static final String USSD_STRING_SEPARATOR = ",";
+
 	// TODO: AddressString and IMSI hashCode + equals
 	protected boolean initiated;
 	protected boolean generated;

diff --git a/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/plain/CDRGeneratorSbb.java b/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/cdr/plain/CDRGeneratorSbb.java
@@ -341,7 +341,7 @@ protected String toString(USSDCDRState state) {
       }
       //_COLUMN_USSD_STRING
       String ussdString = state.getUssdString();
-      if(!ussdString.isEmpty()){
+      if (ussdString != null && !ussdString.isEmpty()) {
           sb.append(sb.append(ussdString).append(SEPARATOR));
       }else{
           sb.append(SEPARATOR);

diff --git a/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/http/HttpServerSbb.java b/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/http/HttpServerSbb.java
@@ -491,6 +491,22 @@ public void onUnstructuredSSResponse(UnstructuredSSResponse event, ActivityConte
 		super.ussdStatAggregator.updateMessagesRecieved();
         super.ussdStatAggregator.updateMessagesAll();
 
+        ChargeInterface cdrInterface = this.getCDRChargeInterface();
+        USSDCDRState state = cdrInterface.getState();
+
+        try {
+            if (state.isInitialized()) {
+                String ussdString = event.getUSSDString().getString(null);
+                if (state.getUssdString() == null) {
+                    state.setUssdString(ussdString);
+                } else {
+                    state.setUssdString(state.getUssdString() + USSDCDRState.USSD_STRING_SEPARATOR + ussdString);
+                }
+            }
+        } catch (Exception e) {
+            logger.warning("Exception when setting of UssdString CDR parameter in HttpServerSbb" + e.getMessage(), e);
+        }
+
 		this.processReceivedMAPEvent((MAPEvent) event);
 
 		this.setTimer(aci);

diff --git a/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/sip/SipServerSbb.java b/core/slee/sbbs/src/main/java/org/mobicents/ussdgateway/slee/sip/SipServerSbb.java
@@ -276,6 +276,22 @@ public void onUnstructuredSSResponse(UnstructuredSSResponse event, ActivityConte
         super.ussdStatAggregator.updateMessagesRecieved();
         super.ussdStatAggregator.updateMessagesAll();
 
+        ChargeInterface cdrInterface = this.getCDRChargeInterface();
+        USSDCDRState state = cdrInterface.getState();
+
+        try {
+            if (state.isInitialized()) {
+                String ussdString = event.getUSSDString().getString(null);
+                if (state.getUssdString() == null) {
+                    state.setUssdString(ussdString);
+                } else {
+                    state.setUssdString(state.getUssdString() + USSDCDRState.USSD_STRING_SEPARATOR + ussdString);
+                }
+            }
+        } catch (Exception e) {
+            logger.warning("Exception when setting of UssdString CDR parameter in HttpServerSbb" + e.getMessage(), e);
+        }
+
 		try {
 			SipUssdMessage simMsg = new SipUssdMessage(event.getDataCodingScheme(), event.getUSSDString());
 			simMsg.setAnyExt(new AnyExt(MAPMessageType.unstructuredSSRequest_Response));