Fix threadlocal, update parent and seed versions

seedstack · Apr 26, 2016 · 75e5652 · 75e5652
1 parent ecdae5e
commit 75e5652
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
-# Version 2.1.2 (?)
+# Version 2.1.2 (2016-04-26)
 
-* [chg] Update for SeedStack 16.4
+* [chg] Update for SeedStack 16.4.
+* [fix] Correctly cleanup `ThreadLocal` in `JmsSessionLink`.
 
 # Version 2.1.1 (2016-01-21)
 

diff --git a/core/src/main/java/org/seedstack/jms/internal/JmsSessionLink.java b/core/src/main/java/org/seedstack/jms/internal/JmsSessionLink.java
@@ -45,6 +45,11 @@ void push(Session session) {
     }
 
     Session pop() {
-        return sessionThreadLocal.get().pop();
+        Deque<Session> sessions = sessionThreadLocal.get();
+        Session session = sessions.pop();
+        if (sessions.isEmpty()) {
+            sessionThreadLocal.remove();
+        }
+        return session;
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.seedstack.poms</groupId>
         <artifactId>parent-internal</artifactId>
-        <version>2.4.0-SNAPSHOT</version>
+        <version>2.4.0</version>
     </parent>
 
     <groupId>org.seedstack.addons.jms</groupId>
@@ -23,7 +23,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <seed.version>2.3.0-SNAPSHOT</seed.version>
+        <seed.version>2.3.0</seed.version>
 
         <compatibility.version>2.1.0</compatibility.version>