From 78e1569264db0c74b2f7354c2a87a8a6d60c95cf Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Wed, 5 Mar 2014 14:54:41 +0900
Subject: [PATCH] Prevent connections from one pool from bleeding over to
 threads requesting connections from another pool (stored in ThreadLocal).

---
 src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
index 8ee373ae..0b28a830 100644
--- a/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
+++ b/src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
@@ -66,6 +66,7 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
     private ThreadLocal<LinkedList<T>> threadList;
     private CopyOnWriteArraySet<T> sharedList;
     private Synchronizer synchronizer;
+    private Class<?> typeClass;
 
     /**
      * Constructor.
@@ -99,7 +100,7 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
         while (!list.isEmpty())
         {
             final T reference = list.removeFirst();
-            if (reference.compareAndSetState(STATE_NOT_IN_USE, STATE_IN_USE))
+            if (reference.compareAndSetState(STATE_NOT_IN_USE, STATE_IN_USE) && reference.getClass() == typeClass)
             {
                 return reference;
             }
@@ -160,6 +161,11 @@ public class ConcurrentBag<T extends com.zaxxer.hikari.util.ConcurrentBag.IBagMa
      */
     public void add(T value)
     {
+    	if (typeClass == null)
+    	{
+    		typeClass = value.getClass();
+    	}
+
         sharedList.add(value);
         synchronizer.releaseShared(1);
     }