Revision: 15639
Author: [email protected]
Date: Mon Dec 6 04:43:28 2010
Log: Update Issue 2130
Committing another fix to avoid memory leak of the Client transaction when
there is an error sending the request out for the proxying case
http://code.google.com/p/mobicents/source/detail?r=15639
Modified:
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java
/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/JainSipUtils.java
Mon Jul 26 12:24:56 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/JainSipUtils.java
Mon Dec 6 04:43:28 2010
@@ -40,6 +40,8 @@
import java.util.TreeSet;
import javax.sip.ListeningPoint;
+import javax.sip.ObjectInUseException;
+import javax.sip.Transaction;
import javax.sip.address.SipURI;
import javax.sip.address.URI;
import javax.sip.header.AcceptEncodingHeader;
@@ -100,6 +102,7 @@
import org.mobicents.servlet.sip.core.ExtendedListeningPoint;
import org.mobicents.servlet.sip.core.SipNetworkInterfaceManager;
import org.mobicents.servlet.sip.core.dispatchers.MessageDispatcher;
+import org.mobicents.servlet.sip.message.SipServletRequestImpl;
import org.mobicents.servlet.sip.message.SipFactoryImpl.NamesComparator;
/**
@@ -110,6 +113,7 @@
* @author Jean Deruelle
*/
public final class JainSipUtils {
+ private static final Logger logger =
Logger.getLogger(JainSipUtils.class);
/**
* The maximum int value that could correspond to a port nubmer.
@@ -661,5 +665,20 @@
return true;
}
return false;
+ }
+
+ public static void terminateTransaction(Transaction transaction) {
+ // Issue 2130
(http://code.google.com/p/mobicents/issues/detail?id=2130) : Memory leak in
Sip stack when INFO message is used
+ // fail before the ctx is created to avoid mem leaks
+ if(transaction != null) {
+ if(logger.isDebugEnabled()) {
+ logger.debug("terminating transaction " + transaction + " with
transaction id "+ transaction.getBranchId());
+ }
+ try {
+ transaction.terminate();
+ } catch (ObjectInUseException e) {
+ logger.error("Couldn't terminate the transaction " + transaction + "
with transaction id "+ transaction.getBranchId());
+ }
+ }
}
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/core/dispatchers/RequestDispatcher.java
Wed Jul 7 09:28:26 2010
+++
/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
@@ -187,8 +187,12 @@
((TransactionApplicationData)serverTransaction.getApplicationData()).setTransaction(ctx);
if(logger.isInfoEnabled()) {
logger.info("Sending the request through a new client transaction " +
clonedRequest);
- }
- ctx.sendRequest();
+ }
+ try {
+ ctx.sendRequest();
+ } finally {
+ JainSipUtils.terminateTransaction(ctx);
+ }
} else {
TransactionApplicationData appData = (TransactionApplicationData)
transaction.getApplicationData();
if(appData == null) {
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Mon Dec 6 03:29:32 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/message/SipServletRequestImpl.java
Mon Dec 6 04:43:28 2010
@@ -1329,18 +1329,7 @@
} catch (Exception ex) {
throw new IllegalStateException("Error sending request
" + request,ex);
} finally {
- // Issue 2130
(http://code.google.com/p/mobicents/issues/detail?id=2130) : Memory leak in
Sip stack when INFO message is used
- // fail before the ctx is created to avoid mem leaks
- if(getTransaction() != null) {
- if(logger.isDebugEnabled()) {
- logger.debug("terminating client transaction " +
getTransaction().getBranchId() + " since the request couldn't be sent " +
request);
- }
- try {
- getTransaction().terminate();
- } catch (ObjectInUseException e) {
- logger.error("Couldn't terminate the client transaction " +
getTransaction().getBranchId());
- }
- }
+ JainSipUtils.terminateTransaction(getTransaction());
}
}
=======================================
---
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Thu Oct 28 09:49:13 2010
+++
/trunk/servers/sip-servlets/sip-servlets-impl/src/main/java/org/mobicents/servlet/sip/proxy/ProxyBranchImpl.java
Mon Dec 6 04:43:28 2010
@@ -716,9 +716,9 @@
if(sipAppSession != null) {
sipAppSession.access();
}
- try {
- ClientTransaction ctx = sipProvider
- .getNewClientTransaction(clonedRequest);
+ ClientTransaction ctx = null;
+ try {
+ ctx =
sipProvider.getNewClientTransaction(clonedRequest);
ctx.setRetransmitTimer(sipApplicationDispatcher.getBaseTimerInterval());
((TransactionExt)ctx).setTimerT2(sipApplicationDispatcher.getT2Interval());
((TransactionExt)ctx).setTimerT4(sipApplicationDispatcher.getT4Interval());
@@ -730,7 +730,9 @@
ctx.sendRequest();
} catch (SipException e) {
- logger.error("A problem occured while proxying a request in a
dialog-stateless transaction", e);
+ logger.error("A problem occured while proxying a request " + request
+ " in a dialog-stateless transaction", e);
+ } finally {
+ JainSipUtils.terminateTransaction(ctx);
}
}