[jboss-cvs] JBossAS SVN: r112554 - branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager.

[jboss-cvs-commits at lists.jboss.org]

Author: jbertram
Date: 2012-01-05 15:47:24 -0500 (Thu, 05 Jan 2012)
New Revision: 112554

Modified:
   branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
Log:
JBPAPP-7863

Modified: branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java
===================================================================
--- branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2012-01-05 16:06:17 UTC (rev 112553)
+++ branches/JBPAPP_5_1_3_interim/connector/src/main/org/jboss/resource/connectionmanager/InternalManagedConnectionPool.java	2012-01-05 20:47:24 UTC (rev 112554)
@@ -317,7 +317,12 @@
       {
          long end = System.currentTimeMillis() - startWait;
          connectionCounter.updateBlockTime(end);
-         throw new ResourceException("Interrupted while requesting permit! Waited " + end + " ms");
+         String addendum = "";
+         if (end == 0)
+         {
+             addendum = ". The 0 ms wait time suggests the thread was already interrupted before attempting to acquire the connection. Ensure the calling thread's interrupted status is cleared before calling getConnection().";
+         }
+         throw new ResourceException("Interrupted while requesting permit! Waited " + end + " ms" + addendum);
       }
    }