From: Weston P. <wes...@jb...> - 2006-05-31 22:36:36
|
User: wprice Date: 06/05/31 18:36:34 Modified: src/main/org/jboss/resource/connectionmanager JBossManagedConnectionPool.java Log: [JBAS-1466] Forgot to carry over prefill for children pools. Revision Changes Path 1.45 +69 -20 jbosscx/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossManagedConnectionPool.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java,v retrieving revision 1.44 retrieving revision 1.45 diff -u -b -r1.44 -r1.45 --- JBossManagedConnectionPool.java 31 May 2006 20:37:50 -0000 1.44 +++ JBossManagedConnectionPool.java 31 May 2006 22:36:34 -0000 1.45 @@ -66,7 +66,7 @@ * @author <a href="mailto:ad...@jb...">Adrian Brock</a> * @author <a href="mailto:wes...@jb...">Weston Price</a> * - * @version $Revision: 1.44 $ + * @version $Revision: 1.45 $ */ public class JBossManagedConnectionPool extends ServiceMBeanSupport implements JBossManagedConnectionPoolMBean, NotificationListener @@ -925,14 +925,32 @@ return new SubjectCriKey(subject, cri, separateNoTx); } - public void prefill(Subject subject) + public void prefill() + { + prefill(null, null, false); + } + + public void prefill(boolean noTxSeperatePool) { - if(getPreFill()){ + prefill(null, null, noTxSeperatePool); + } - log.warn("warn: Pool instance " + getClass() + " does not support prefilling. Please verify config."); + public void prefill(Subject subject, ConnectionRequestInfo cri) + { + prefill(subject, cri, false); } + public void prefill(Subject subject, ConnectionRequestInfo cri, boolean noTxSeperatePool) + { + if (getPreFill()) + { + log.warn("Prefill pool option was selected for pool with JNDI name " + getPoolName() + + " that does not support this feature."); + log + .warn("Please verify your *-ds.xml file that corresponds with this resource and either remove the <prefill>true|false</prefill element or explicitly set this value to false."); + + } } } @@ -1006,18 +1024,30 @@ return new SubjectKey(subject, separateNoTx); } - public void prefill(Subject subject) + public void prefill() { - log.debug("Attempting to prefill pool" + getClass()); + prefill(null, null, false); + } - try + public void prefill(boolean noTxSeperatePool) { - getSubPool(getKey(null, null, false), null, null); + prefill(null, null, noTxSeperatePool); } - catch (ResourceException e) + public void prefill(Subject subject, ConnectionRequestInfo cri) { - log.error("Prefill failed for pool instance " + getClass(), e); + prefill(subject, cri, false); + + } + + public void prefill(Subject subject, ConnectionRequestInfo cri, boolean noTxSeperatePool) + { + if (getPreFill()) + { + log.warn("Prefill pool option was selected for pool with JNDI name " + getPoolName() + + " that does not support this feature."); + log + .warn("Please verify your *-ds.xml file that corresponds with this resource and either remove the <prefill>true|false</prefill element or explicitly set this value to false."); } } @@ -1084,11 +1114,30 @@ return new CriKey(cri, separateNoTx); } - public void prefill(Subject subject) + public void prefill() + { + prefill(null, null, false); + } + + public void prefill(boolean noTxSeperatePool) + { + prefill(null, null, noTxSeperatePool); + } + + public void prefill(Subject subject, ConnectionRequestInfo cri) { - if(getPreFill()){ + prefill(subject, cri, false); - log.warn("warn: Pool instance " + getClass() + " does not support prefilling. Please verify config."); + } + + public void prefill(Subject subject, ConnectionRequestInfo cri, boolean noTxSeperatePool) + { + if (getPreFill()) + { + log.warn("Prefill pool option was selected for pool with JNDI name " + getPoolName() + + " that does not support this feature."); + log + .warn("Please verify your *-ds.xml file that corresponds with this resource and either remove the <prefill>true|false</prefill element or explicitly set this value to false."); } } |