Revision: 16434
Author: brainslog
Date: Fri Jan 14 12:45:06 2011
Log: Cleaning up Diameter RAs TXs
http://code.google.com/p/mobicents/source/detail?r=16434
Modified:
/trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java
/trunk/servers/jain-slee/resources/diameter-cca/ra/src/main/java/org/mobicents/slee/resource/diameter/cca/DiameterCCAResourceAdaptor.java
/trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java
/trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java
/trunk/servers/jain-slee/resources/diameter-sh-server/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/server/DiameterShServerResourceAdaptor.java
=======================================
---
/trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java
Fri Nov 26 09:05:04 2010
+++
/trunk/servers/jain-slee/resources/diameter-base/ra/src/main/java/org/mobicents/slee/resource/diameter/base/DiameterBaseResourceAdaptor.java
Fri Jan 14 12:45:06 2011
@@ -47,7 +47,6 @@
import javax.slee.resource.ResourceAdaptor;
import javax.slee.resource.ResourceAdaptorContext;
import javax.slee.resource.SleeEndpoint;
-import javax.slee.transaction.SleeTransactionManager;
import net.java.slee.resource.diameter.Validator;
import
net.java.slee.resource.diameter.base.AccountingClientSessionActivity;
@@ -872,14 +871,7 @@
* @see
org.jdiameter.api.NetworkReqListener#processRequest(org.jdiameter.api.Request)
*/
public Answer processRequest(Request request) {
- final SleeTransactionManager txManager =
raContext.getSleeTransactionManager();
-
- boolean terminateTx = false;
-
try {
- txManager.begin();
- terminateTx = true;
-
DiameterActivityImpl activity = (DiameterActivityImpl)
raProvider.createActivity(request);
// Here we have either created activity or got old one, In cass of
app activities,
@@ -910,20 +902,9 @@
else {
//FIXME: Error?
}
-
- terminateTx = false;
- txManager.commit();
}
catch (Throwable e) {
tracer.severe("Failed to process request.", e);
- if (terminateTx) {
- try {
- txManager.rollback();
- }
- catch (Throwable t) {
- tracer.severe(t.getMessage(), t);
- }
- }
}
// returning null so we can answer later
=======================================
---
/trunk/servers/jain-slee/resources/diameter-cca/ra/src/main/java/org/mobicents/slee/resource/diameter/cca/DiameterCCAResourceAdaptor.java
Fri Nov 26 09:05:04 2010
+++
/trunk/servers/jain-slee/resources/diameter-cca/ra/src/main/java/org/mobicents/slee/resource/diameter/cca/DiameterCCAResourceAdaptor.java
Fri Jan 14 12:45:06 2011
@@ -813,14 +813,6 @@
// NetworkReqListener Implementation -----------------------------------
public Answer processRequest(Request request) {
- //final SleeTransactionManager txManager =
raContext.getSleeTransactionManager();
-
- //boolean terminateTx = false;
- //
- //try {
- // txManager.begin();
- // terminateTx = true;
-
// Here we receive initial request for which session does not exist!
// Valid messages are:
// * CCR - if we act as server, this is the message we receive
@@ -850,22 +842,6 @@
else {
tracer.severe("Diameter CCA RA :: Received unexpected Request.
Either its not CCR or session should exist to handle this,
Command-Code: "+request.getCommandCode()+",
Session-Id: "+request.getSessionId());
}
-
- // terminateTx = false;
- // txManager.commit();
- //}
- //catch (Throwable e) {
- // tracer.severe(e.getMessage(), e);
- //
- // if (terminateTx) {
- // try {
- // txManager.rollback();
- // }
- // catch (Throwable t) {
- // tracer.severe(t.getMessage(), t);
- // }
- // }
- //}
// Returning null so we can answer later
return null;
=======================================
---
/trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java
Fri Nov 26 09:05:04 2010
+++
/trunk/servers/jain-slee/resources/diameter-cx-dx/ra/src/main/java/org/mobicents/slee/resource/diameter/cxdx/DiameterCxDxResourceAdaptor.java
Fri Jan 14 12:45:06 2011
@@ -44,7 +44,6 @@
import javax.slee.resource.ResourceAdaptor;
import javax.slee.resource.ResourceAdaptorContext;
import javax.slee.resource.SleeEndpoint;
-import javax.slee.transaction.SleeTransactionManager;
import net.java.slee.resource.diameter.Validator;
import net.java.slee.resource.diameter.base.CreateActivityException;
@@ -800,30 +799,11 @@
* @see
org.jdiameter.api.NetworkReqListener#processRequest(org.jdiameter.api.Request)
*/
public Answer processRequest(Request request) {
- final SleeTransactionManager txManager =
raContext.getSleeTransactionManager();
-
- boolean terminateTx = false;
-
try {
- txManager.begin();
- terminateTx = true;
-
raProvider.createActivity(request);
-
- // do nothing here, if its valid it should be processed, if not we
will get exception
- terminateTx = false;
- txManager.commit();
}
catch (Throwable e) {
tracer.severe(e.getMessage(), e);
- if (terminateTx) {
- try {
- txManager.rollback();
- }
- catch (Throwable t) {
- tracer.severe(t.getMessage(), t);
- }
- }
}
// returning null so we can answer later
=======================================
---
/trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java
Fri Nov 26 09:05:04 2010
+++
/trunk/servers/jain-slee/resources/diameter-sh-client/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/client/DiameterShClientResourceAdaptor.java
Fri Jan 14 12:45:06 2011
@@ -49,7 +49,6 @@
import javax.slee.resource.ResourceAdaptor;
import javax.slee.resource.ResourceAdaptorContext;
import javax.slee.resource.SleeEndpoint;
-import javax.slee.transaction.SleeTransactionManager;
import net.java.slee.resource.diameter.Validator;
import net.java.slee.resource.diameter.base.CreateActivityException;
@@ -823,29 +822,11 @@
// NetworkReqListener Implementation -----------------------------------
public Answer processRequest(Request request) {
- final SleeTransactionManager txManager =
raContext.getSleeTransactionManager();
-
- boolean terminateTx = false;
-
try {
- txManager.begin();
- terminateTx = true;
-
raProvider.createActivity(request);
- // do nothing here, if its valid it should be processed, if not we
will get exception
- terminateTx = false;
- txManager.commit();
}
catch (Throwable e) {
tracer.severe(e.getMessage(), e);
- if (terminateTx) {
- try {
- txManager.rollback();
- }
- catch (Throwable t) {
- tracer.severe(t.getMessage(), t);
- }
- }
}
// returning null so we can answer later
=======================================
---
/trunk/servers/jain-slee/resources/diameter-sh-server/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/server/DiameterShServerResourceAdaptor.java
Fri Nov 26 09:05:04 2010
+++
/trunk/servers/jain-slee/resources/diameter-sh-server/ra/src/main/java/org/mobicents/slee/resource/diameter/sh/server/DiameterShServerResourceAdaptor.java
Fri Jan 14 12:45:06 2011
@@ -835,29 +835,11 @@
// NetworkReqListener Implementation -----------------------------------
public Answer processRequest(Request request) {
- //final SleeTransactionManager txManager =
raContext.getSleeTransactionManager();
-
- // boolean terminateTx = false;
-
try {
- //txManager.begin();
- //terminateTx = true;
-
raProvider.createActivity(request);
- // do nothing here, if its valid it should be processed, if not we
will get exception
- //terminateTx = false;
- //txManager.commit();
}
catch (Throwable e) {
tracer.severe(e.getMessage(), e);
- //if (terminateTx) {
- // try {
- // txManager.rollback();
- // }
- // catch (Throwable t) {
- // tracer.severe(t.getMessage(), t);
- // }
- //}
}
// returning null so we can answer later