2 new revisions:
Revision: 421149b49a48
Author: emmartins <[email protected]>
Date: Thu Dec 27 04:23:11 2012
Log: Issue 21: removes cleanup of the wrapped tx and ensures toString
impls...
http://code.google.com/p/jain-slee/source/detail?r=421149b49a48&repo=sip
Revision: 1bfe5d140ba0
Author: emmartins <[email protected]>
Date: Thu Dec 27 04:24:04 2012
Log: Merge branch 'master' of https://code.google.com/p/jain-slee.sip
http://code.google.com/p/jain-slee/source/detail?r=1bfe5d140ba0&repo=sip
==============================================================================
Revision: 421149b49a48
Author: emmartins <[email protected]>
Date: Thu Dec 27 04:23:11 2012
Log: Issue 21: removes cleanup of the wrapped tx and ensures toString
impls are always safe
http://code.google.com/p/jain-slee/source/detail?r=421149b49a48&repo=sip
Modified:
/.gitignore
/pom.xml
/resources/sip11/ra/src/main/java/org/mobicents/slee/resource/sip11/wrappers/ClientTransactionWrapper.java
/resources/sip11/ra/src/main/java/org/mobicents/slee/resource/sip11/wrappers/ServerTransactionWrapper.java
=======================================
--- /.gitignore Sun Aug 12 06:02:08 2012
+++ /.gitignore Thu Dec 27 04:23:11 2012
@@ -1,3 +1,6 @@
+# Mobicents
+${release.dir}
+
# Java compiled #
#################
*.class
=======================================
--- /pom.xml Mon Sep 10 17:21:24 2012
+++ /pom.xml Thu Dec 27 04:23:11 2012
@@ -4,7 +4,7 @@
<parent>
<groupId>org.mobicents</groupId>
<artifactId>mobicents-parent</artifactId>
- <version>2.23-SNAPSHOT</version>
+ <version>2.23</version>
</parent>
<groupId>org.mobicents.servers.jainslee.sip</groupId>
=======================================
---
/resources/sip11/ra/src/main/java/org/mobicents/slee/resource/sip11/wrappers/ClientTransactionWrapper.java
Sun Aug 12 06:02:08 2012
+++
/resources/sip11/ra/src/main/java/org/mobicents/slee/resource/sip11/wrappers/ClientTransactionWrapper.java
Thu Dec 27 04:23:11 2012
@@ -192,7 +192,8 @@
@Override
public String toString() {
- final String id = wrappedTransaction == null ? "null" :
wrappedTransaction.getBranchId();
+ final Transaction transaction = this.wrappedTransaction;
+ final String id = transaction == null ? "null" :
transaction.getBranchId();
return new StringBuilder("ClientTransaction[").append(id)
.append(']').toString();
}
@@ -214,7 +215,6 @@
if (wrappedTransaction != null) {
wrappedTransaction.setApplicationData(null);
}
- wrappedTransaction = null;
}
@Override
=======================================
---
/resources/sip11/ra/src/main/java/org/mobicents/slee/resource/sip11/wrappers/ServerTransactionWrapper.java
Sun Aug 12 06:02:08 2012
+++
/resources/sip11/ra/src/main/java/org/mobicents/slee/resource/sip11/wrappers/ServerTransactionWrapper.java
Thu Dec 27 04:23:11 2012
@@ -198,7 +198,8 @@
@Override
public String toString() {
- final String id = wrappedTransaction == null ? String.valueOf(null) :
wrappedTransaction.getBranchId();
+ final Transaction transaction = this.wrappedTransaction;
+ final String id = transaction == null ? "null" :
transaction.getBranchId();
return new
StringBuilder("ServerTransaction[").append(id).append(']').toString();
}
@@ -217,7 +218,6 @@
if (wrappedTransaction != null) {
wrappedTransaction.setApplicationData(null);
}
- wrappedTransaction = null;
}
}
==============================================================================
Revision: 1bfe5d140ba0
Author: emmartins <[email protected]>
Date: Thu Dec 27 04:24:04 2012
Log: Merge branch 'master' of https://code.google.com/p/jain-slee.sip
http://code.google.com/p/jain-slee/source/detail?r=1bfe5d140ba0&repo=sip
