Revision: d2400dff6029
Author: [email protected] <[email protected]>
Date: Tue Dec 11 01:02:49 2012
Log: Issue 19:Upgrade TCAP, MAP and CAP RA to use latest API's of
stack - getLocalDialogId / getRemoteDialogId
http://code.google.com/p/jain-slee/source/detail?r=d2400dff6029&repo=ss7
Modified:
/resources/cap/pom.xml
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/CAPResourceAdaptor.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/circuitSwitchedCall/wrappers/CAPServiceCircuitSwitchedCallWrapper.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/gprs/wrappers/CAPServiceGprsWrapper.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/sms/wrappers/CAPServiceSmsWrapper.java
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
/resources/map/pom.xml
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/callhandling/wrappers/MAPServiceCallHandlingWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/lsm/wrappers/MAPServiceLsmWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/mobility/wrappers/MAPServiceMobilityWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/oam/wrappers/MAPServiceOamWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/pdpContextActivation/wrappers/MAPServicePdpContextActivationWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/sms/wrappers/MAPServiceSmsWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/MAPServiceSupplementaryWrapper.java
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
/resources/tcap/pom.xml
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/TCAPResourceAdaptor.java
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPDialogWrapper.java
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPProviderWrapper.java
=======================================
--- /resources/cap/pom.xml Wed Nov 21 13:26:21 2012
+++ /resources/cap/pom.xml Tue Dec 11 01:02:49 2012
@@ -28,7 +28,7 @@
<docs.ra.dirname>CAP</docs.ra.dirname>
<docs.bookid>CAP</docs.bookid>
- <ss7.version>2.0.0.BETA3</ss7.version>
+ <ss7.version>2.0.0-SNAPSHOT</ss7.version>
<asn.version>2.0.1.FINAL</asn.version>
<stream.version>1.0.0.FINAL</stream.version>
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/CAPResourceAdaptor.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/CAPResourceAdaptor.java
Tue Dec 11 01:02:49 2012
@@ -416,7 +416,7 @@
if (this.tracer.isFineEnabled()) {
this.tracer
- .fine(String.format("Firing %s for DialogId=%d", eventName,
dw.getWrappedDialog().getDialogId()));
+ .fine(String.format("Firing %s for DialogId=%d", eventName,
dw.getWrappedDialog().getLocalDialogId()));
}
this.fireEvent(eventName, dw.getActivityHandle(), event);
@@ -476,10 +476,10 @@
try {
if (this.tracer.isFineEnabled()) {
- this.tracer.fine(String.format("Received onDialogRequest id=%d ",
capDialog.getDialogId()));
+ this.tracer.fine(String.format("Received onDialogRequest id=%d ",
capDialog.getLocalDialogId()));
}
- CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getDialogId());
+ CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getLocalDialogId());
CAPDialogWrapper capDialogWrapper = null;
if (capDialog instanceof CAPDialogCircuitSwitchedCall) {
@@ -489,7 +489,7 @@
} else if (capDialog instanceof CAPDialogSms) {
capDialogWrapper = new CAPDialogSmsWrapper((CAPDialogSms) capDialog,
activityHandle, this);
} else {
- this.tracer.severe(String.format("Received onDialogRequest id=%d for
unknown CAPDialog class=%s", capDialog.getDialogId(),
+ this.tracer.severe(String.format("Received onDialogRequest id=%d for
unknown CAPDialog class=%s", capDialog.getLocalDialogId(),
capDialog.getClass().getName()));
return;
}
@@ -530,7 +530,7 @@
// TODO: done like that, since we want to process dialog
callbacks
// before we fire event.
if (this.tracer.isFineEnabled()) {
- this.tracer.fine(String.format("Rx : onDialogTimeout for DialogId=%d",
capDialog.getDialogId()));
+ this.tracer.fine(String.format("Rx : onDialogTimeout for DialogId=%d",
capDialog.getLocalDialogId()));
}
CAPDialogWrapper capDialogWrapper = (CAPDialogWrapper)
capDialog.getUserObject();
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/circuitSwitchedCall/wrappers/CAPServiceCircuitSwitchedCallWrapper.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/circuitSwitchedCall/wrappers/CAPServiceCircuitSwitchedCallWrapper.java
Tue Dec 11 01:02:49 2012
@@ -74,7 +74,7 @@
public CAPDialogCircuitSwitchedCall createNewDialog(CAPApplicationContext
appCntx, SccpAddress origAddress, SccpAddress destAddress) throws
CAPException {
CAPDialogCircuitSwitchedCall capDialog =
this.wrappedCircuitSwitchedCall.createNewDialog(appCntx, origAddress,
destAddress);
- CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getDialogId());
+ CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getLocalDialogId());
CAPDialogCircuitSwitchedCallWrapper dw = new
CAPDialogCircuitSwitchedCallWrapper(capDialog, activityHandle,
this.capProviderWrapper.getRa());
capDialog.setUserObject(dw);
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/gprs/wrappers/CAPServiceGprsWrapper.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/gprs/wrappers/CAPServiceGprsWrapper.java
Tue Dec 11 01:02:49 2012
@@ -74,7 +74,7 @@
public CAPDialogGprs createNewDialog(CAPApplicationContext appCntx,
SccpAddress origAddress, SccpAddress destAddress) throws CAPException {
CAPDialogGprs capDialog = this.wrappedGprs.createNewDialog(appCntx,
origAddress, destAddress);
- CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getDialogId());
+ CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getLocalDialogId());
CAPDialogGprsWrapper dw = new CAPDialogGprsWrapper(capDialog,
activityHandle, this.capProviderWrapper.getRa());
capDialog.setUserObject(dw);
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/sms/wrappers/CAPServiceSmsWrapper.java
Sat Sep 1 07:28:22 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/service/sms/wrappers/CAPServiceSmsWrapper.java
Tue Dec 11 01:02:49 2012
@@ -73,7 +73,7 @@
public CAPDialogSms createNewDialog(CAPApplicationContext appCntx,
SccpAddress origAddress, SccpAddress destAddress) throws CAPException {
CAPDialogSms capDialog = this.wrappedSms.createNewDialog(appCntx,
origAddress, destAddress);
- CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getDialogId());
+ CAPDialogActivityHandle activityHandle = new
CAPDialogActivityHandle(capDialog.getLocalDialogId());
CAPDialogSmsWrapper dw = new CAPDialogSmsWrapper(capDialog,
activityHandle, this.capProviderWrapper.getRa());
capDialog.setUserObject(dw);
=======================================
---
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
Mon Sep 3 02:19:28 2012
+++
/resources/cap/ra/src/main/java/org/mobicents/slee/resource/cap/wrappers/CAPDialogWrapper.java
Tue Dec 11 01:02:49 2012
@@ -76,8 +76,12 @@
return this.wrappedDialog.getApplicationContext();
}
- public Long getDialogId() {
- return this.wrappedDialog.getDialogId();
+ public Long getLocalDialogId() {
+ return this.wrappedDialog.getLocalDialogId();
+ }
+
+ public Long getRemoteDialogId() {
+ return this.wrappedDialog.getRemoteDialogId();
}
public int getMaxUserDataLength() {
=======================================
--- /resources/map/pom.xml Wed Nov 21 13:26:21 2012
+++ /resources/map/pom.xml Tue Dec 11 01:02:49 2012
@@ -28,7 +28,7 @@
<docs.ra.dirname>MAP</docs.ra.dirname>
<docs.bookid>MAP</docs.bookid>
- <ss7.version>2.0.0.BETA3</ss7.version>
+ <ss7.version>2.0.0-SNAPSHOT</ss7.version>
<asn.version>2.0.1.FINAL</asn.version>
<stream.version>1.0.0.FINAL</stream.version>
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
Mon Nov 19 01:31:31 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/MAPResourceAdaptor.java
Tue Dec 11 01:02:49 2012
@@ -507,7 +507,7 @@
if (mapDialogActHndl == null) {
if (this.tracer.isWarningEnabled()) {
this.tracer.warning("Activity ended but no MAPDialogActivityHandle
found for Dialog ID, ignoring "
- + mapDialog.getDialogId());
+ + mapDialog.getLocalDialogId());
}
} else {
try {
@@ -519,7 +519,7 @@
}
this.sleeEndpoint.endActivity(mapDialogActHndl);
if (tracer.isFineEnabled())
- this.tracer.fine("Activity marked to be ended:" +
mapDialog.getDialogId());
+ this.tracer.fine("Activity marked to be ended:" +
mapDialog.getLocalDialogId());
}
}
@@ -571,7 +571,7 @@
if (this.tracer.isFineEnabled()) {
this.tracer
- .fine(String.format("Firing %s for DialogId=%d", eventName,
dw.getWrappedDialog().getDialogId()));
+ .fine(String.format("Firing %s for DialogId=%d", eventName,
dw.getWrappedDialog().getLocalDialogId()));
}
this.fireEvent(eventName, dw.getActivityHandle(), event, flags);
@@ -658,10 +658,10 @@
try {
if (this.tracer.isFineEnabled()) {
- this.tracer.fine(String.format("Received onDialogRequest id=%d ",
mapDialog.getDialogId()));
+ this.tracer.fine(String.format("Received onDialogRequest id=%d ",
mapDialog.getLocalDialogId()));
}
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogWrapper mapDialogWrapper = null;
if (mapDialog instanceof MAPDialogMobility) {
@@ -679,7 +679,7 @@
} else if (mapDialog instanceof MAPDialogLsm) {
mapDialogWrapper = new MAPDialogLsmWrapper((MAPDialogLsm) mapDialog,
activityHandle, this);
} else {
- this.tracer.severe(String.format("Received onDialogRequest id=%d for
unknown MAPDialog class=%s", mapDialog.getDialogId(),
+ this.tracer.severe(String.format("Received onDialogRequest id=%d for
unknown MAPDialog class=%s", mapDialog.getLocalDialogId(),
mapDialog.getClass().getName()));
return;
}
@@ -753,7 +753,7 @@
// TODO: done like that, since we want to process dialog
callbacks
// before we fire event.
if (this.tracer.isFineEnabled()) {
- this.tracer.fine(String.format("Rx : onDialogTimeout for DialogId=%d",
mapDialog.getDialogId()));
+ this.tracer.fine(String.format("Rx : onDialogTimeout for DialogId=%d",
mapDialog.getLocalDialogId()));
}
// MAPDialogWrapper mapDialogWrapper = (MAPDialogWrapper)
mapDialog.getUserObject();
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/callhandling/wrappers/MAPServiceCallHandlingWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/callhandling/wrappers/MAPServiceCallHandlingWrapper.java
Tue Dec 11 01:02:49 2012
@@ -76,7 +76,7 @@
public MAPDialogCallHandling createNewDialog(MAPApplicationContext
appCntx, SccpAddress origAddress, AddressString origReference, SccpAddress
destAddress,
AddressString destReference) throws MAPException {
MAPDialogCallHandling mapDialog =
this.wrappedCallHandling.createNewDialog(appCntx, origAddress,
origReference, destAddress, destReference);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogCallHandlingWrapper dw = new
MAPDialogCallHandlingWrapper(mapDialog, activityHandle,
this.mapProviderWrapper.getRa());
mapDialog.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/lsm/wrappers/MAPServiceLsmWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/lsm/wrappers/MAPServiceLsmWrapper.java
Tue Dec 11 01:02:49 2012
@@ -112,7 +112,7 @@
SccpAddress sccpaddress1, AddressString addressstring1) throws
MAPException {
MAPDialogLsm mapDialogLsm =
this.wrappedLSM.createNewDialog(mapapplicationcontext, sccpaddress,
addressstring, sccpaddress1, addressstring1);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialogLsm.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialogLsm.getLocalDialogId());
MAPDialogLsmWrapper dw = new MAPDialogLsmWrapper(mapDialogLsm,
activityHandle, this.mapProviderWrapper.getRa());
mapDialogLsm.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/mobility/wrappers/MAPServiceMobilityWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/mobility/wrappers/MAPServiceMobilityWrapper.java
Tue Dec 11 01:02:49 2012
@@ -59,7 +59,7 @@
AddressString addressstring, SccpAddress sccpaddress1, AddressString
addressstring1) throws MAPException {
MAPDialogMobility mapDialog =
this.wrappedMobility.createNewDialog(mapapplicationcontext, sccpaddress,
addressstring, sccpaddress1, addressstring1);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogMobilityWrapper dw = new MAPDialogMobilityWrapper(mapDialog,
activityHandle,
this.mapProviderWrapper.getRa());
mapDialog.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/oam/wrappers/MAPServiceOamWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/oam/wrappers/MAPServiceOamWrapper.java
Tue Dec 11 01:02:49 2012
@@ -80,7 +80,7 @@
public MAPDialogOam createNewDialog(MAPApplicationContext appCntx,
SccpAddress origAddress, AddressString origReference, SccpAddress
destAddress,
AddressString destReference) throws MAPException {
MAPDialogOam mapDialog = this.wrappedOam.createNewDialog(appCntx,
origAddress, origReference, destAddress, destReference);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogOamWrapper dw = new MAPDialogOamWrapper(mapDialog,
activityHandle, this.mapProviderWrapper.getRa());
mapDialog.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/pdpContextActivation/wrappers/MAPServicePdpContextActivationWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/pdpContextActivation/wrappers/MAPServicePdpContextActivationWrapper.java
Tue Dec 11 01:02:49 2012
@@ -79,7 +79,7 @@
public MAPDialogPdpContextActivation
createNewDialog(MAPApplicationContext appCntx, SccpAddress origAddress,
AddressString origReference,
SccpAddress destAddress, AddressString destReference) throws
MAPException {
MAPDialogPdpContextActivation mapDialog =
this.wrappedPdpContextActivation.createNewDialog(appCntx, origAddress,
origReference, destAddress, destReference);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogPdpContextActivationWrapper dw = new
MAPDialogPdpContextActivationWrapper(mapDialog, activityHandle,
this.mapProviderWrapper.getRa());
mapDialog.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/sms/wrappers/MAPServiceSmsWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/sms/wrappers/MAPServiceSmsWrapper.java
Tue Dec 11 01:02:49 2012
@@ -126,7 +126,7 @@
AddressString addressstring, SccpAddress sccpaddress1, AddressString
addressstring1) throws MAPException {
MAPDialogSms mapDialog =
this.wrappedSMS.createNewDialog(mapapplicationcontext, sccpaddress,
addressstring,
sccpaddress1, addressstring1);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogSmsWrapper dw = new MAPDialogSmsWrapper(mapDialog,
activityHandle, this.mapProviderWrapper.getRa());
mapDialog.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/MAPServiceSupplementaryWrapper.java
Sat Sep 1 07:01:36 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/service/supplementary/wrappers/MAPServiceSupplementaryWrapper.java
Tue Dec 11 01:02:49 2012
@@ -132,7 +132,7 @@
MAPDialogSupplementary mapDialog =
this.wrappedUSSD.createNewDialog(mapapplicationcontext, sccpaddress,
addressstring, sccpaddress1, addressstring1);
- MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getDialogId());
+ MAPDialogActivityHandle activityHandle = new
MAPDialogActivityHandle(mapDialog.getLocalDialogId());
MAPDialogSupplementaryWrapper dw = new
MAPDialogSupplementaryWrapper(mapDialog, activityHandle,
this.mapProviderWrapper.getRa());
mapDialog.setUserObject(dw);
=======================================
---
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Mon Sep 3 02:19:28 2012
+++
/resources/map/ra/src/main/java/org/mobicents/slee/resource/map/wrappers/MAPDialogWrapper.java
Tue Dec 11 01:02:49 2012
@@ -92,9 +92,13 @@
return this.wrappedDialog.getApplicationContext();
}
- public Long getDialogId() {
- return this.wrappedDialog.getDialogId();
+ public Long getLocalDialogId() {
+ return this.wrappedDialog.getLocalDialogId();
}
+
+ public Long getRemoteDialogId() {
+ return this.wrappedDialog.getRemoteDialogId();
+ }
public int getMaxUserDataLength() {
return this.wrappedDialog.getMaxUserDataLength();
=======================================
--- /resources/tcap/pom.xml Wed Nov 21 13:26:21 2012
+++ /resources/tcap/pom.xml Tue Dec 11 01:02:49 2012
@@ -28,7 +28,7 @@
<docs.ra.dirname>TCAP</docs.ra.dirname>
<docs.bookid>TCAP</docs.bookid>
- <ss7.version>2.0.0.BETA3</ss7.version>
+ <ss7.version>2.0.0-SNAPSHOT</ss7.version>
<asn.version>2.0.1.FINAL</asn.version>
<stream.version>1.0.0.FINAL</stream.version>
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/TCAPResourceAdaptor.java
Wed Dec 5 04:31:03 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/TCAPResourceAdaptor.java
Tue Dec 11 01:02:49 2012
@@ -379,7 +379,7 @@
}
if (this.tracer.isFineEnabled()) {
- this.tracer.fine(String.format("Firing %s for DialogId=%d", eventName,
dw.getWrappedDialog().getDialogId()));
+ this.tracer.fine(String.format("Firing %s for DialogId=%d", eventName,
dw.getWrappedDialog().getLocalDialogId()));
}
this.fireEvent(eventName, dw.getActivityHandle(), event, flags);
@@ -404,7 +404,7 @@
public void onTCBegin(TCBeginIndication tcBeginIndication) {
try {
Dialog wrappedDialog = tcBeginIndication.getDialog();
- TCAPDialogActivityHandle activityHandle = new
TCAPDialogActivityHandle(wrappedDialog.getDialogId());
+ TCAPDialogActivityHandle activityHandle = new
TCAPDialogActivityHandle(wrappedDialog.getLocalDialogId());
TCAPDialogWrapper tcapDialogWrapper = new
TCAPDialogWrapper(activityHandle, this, wrappedDialog);
wrappedDialog.setUserObject(tcapDialogWrapper);
@@ -497,7 +497,7 @@
Dialog wrappedDialog = tcUniIndication.getDialog();
try {
- activityHandle = new
TCAPDialogActivityHandle(wrappedDialog.getDialogId());
+ activityHandle = new
TCAPDialogActivityHandle(wrappedDialog.getLocalDialogId());
TCAPDialogWrapper tcapDialogWrapper = new
TCAPDialogWrapper(activityHandle, this, wrappedDialog);
wrappedDialog.setUserObject(tcapDialogWrapper);
@@ -547,7 +547,7 @@
@Override
public void onDialogTimeout(Dialog dialog) {
if (this.tracer.isFineEnabled()) {
- this.tracer.fine(String.format("Rx : onDialogTimeout for DialogId=%d",
dialog.getDialogId()));
+ this.tracer.fine(String.format("Rx : onDialogTimeout for DialogId=%d",
dialog.getLocalDialogId()));
}
dialog.keepAlive();
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPDialogWrapper.java
Wed Dec 5 04:31:03 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPDialogWrapper.java
Tue Dec 11 01:02:49 2012
@@ -120,10 +120,15 @@
* @see
org.mobicents.protocols.ss7.tcap.api.tc.dialog.Dialog#getDialogId()
*/
@Override
- public Long getDialogId() {
- return this.wrappedDialog.getDialogId();
+ public Long getLocalDialogId() {
+ return this.wrappedDialog.getLocalDialogId();
}
+ @Override
+ public Long getRemoteDialogId() {
+ return this.wrappedDialog.getRemoteDialogId();
+ }
+
/*
* (non-Javadoc)
*
=======================================
---
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPProviderWrapper.java
Wed Dec 5 00:37:21 2012
+++
/resources/tcap/ra/src/main/java/org/mobicents/slee/resource/tcap/wrappers/TCAPProviderWrapper.java
Tue Dec 11 01:02:49 2012
@@ -106,7 +106,7 @@
}
Dialog wrappedDialog = this.wrappedProvider.getNewDialog(localAddress,
remoteAddress);
- TCAPDialogActivityHandle activityHanlde = new
TCAPDialogActivityHandle(wrappedDialog.getDialogId());
+ TCAPDialogActivityHandle activityHanlde = new
TCAPDialogActivityHandle(wrappedDialog.getLocalDialogId());
TCAPDialogWrapper dialogWrapper = new TCAPDialogWrapper(activityHanlde,
this.ra, wrappedDialog);
try {
@@ -134,7 +134,7 @@
}
Dialog wrappedDialog =
this.wrappedProvider.getNewUnstructuredDialog(localAddress, remoteAddress);
- TCAPDialogActivityHandle activityHanlde = new
TCAPDialogActivityHandle(wrappedDialog.getDialogId());
+ TCAPDialogActivityHandle activityHanlde = new
TCAPDialogActivityHandle(wrappedDialog.getLocalDialogId());
TCAPDialogWrapper dialogWrapper = new TCAPDialogWrapper(activityHanlde,
this.ra, wrappedDialog);
try {
