Author: kkolinko Date: Fri Mar 22 19:59:02 2013 New Revision: 1459959 URL: http://svn.apache.org/r1459959 Log: Merged revision 1434757 from tomcat/trunk: Make sure changes to result are visible to all threads currently calling get()
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ Merged /tomcat/trunk:r1434757 Modified: tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1459959&r1=1459958&r2=1459959&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original) +++ tomcat/tc7.0.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Fri Mar 22 19:59:02 2013 @@ -1171,7 +1171,7 @@ public class ConnectionPool { Future<PooledConnection> pcFuture = null; AtomicBoolean configured = new AtomicBoolean(false); CountDownLatch latch = new CountDownLatch(1); - Connection result = null; + volatile Connection result = null; SQLException cause = null; AtomicBoolean cancelled = new AtomicBoolean(false); volatile PooledConnection pc = null; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org