Revision: 15641
Author: [email protected]
Date: Mon Dec 6 06:38:50 2010
Log: Update Issue 2130
fixing the location of the terminating transaction statements
http://code.google.com/p/mobicents/source/detail?r=15641
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
Mon Dec 6 04:43:28 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
Mon Dec 6 06:38:50 2010
@@ -190,8 +190,9 @@
}
try {
ctx.sendRequest();
- } finally {
+ } catch(SipException e) {
JainSipUtils.terminateTransaction(ctx);
+ throw e;
}
} else {
TransactionApplicationData appData = (TransactionApplicationData)
transaction.getApplicationData();
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Mon Dec 6 04:43:28 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Mon Dec 6 06:38:50 2010
@@ -1327,10 +1327,9 @@
Thread.currentThread().setContextClassLoader(oldClassLoader);
}
} catch (Exception ex) {
- throw new IllegalStateException("Error sending request
" + request,ex);
- } finally {
JainSipUtils.terminateTransaction(getTransaction());
- }
+ throw new IllegalStateException("Error sending request
" + request,ex);
+ }
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Mon Dec 6 04:43:28 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Mon Dec 6 06:38:50 2010
@@ -731,9 +731,8 @@
ctx.sendRequest();
} catch (SipException e) {
logger.error("A problem occured while proxying a request " + request
+ " in a dialog-stateless transaction", e);
- } finally {
JainSipUtils.terminateTransaction(ctx);
- }
+ }
}
/**