You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@commons.apache.org by gg...@apache.org on 2019/02/14 14:37:21 UTC
svn commit: r1040399 [8/19] - in
/websites/production/commons/content/proper/commons-pool: ./ apidocs/
apidocs/org/apache/commons/pool2/ apidocs/org/apache/commons/pool2/class-use/
apidocs/org/apache/commons/pool2/impl/ apidocs/org/apache/commons/pool2...
Modified: websites/production/commons/content/proper/commons-pool/apidocs/src-html/org/apache/commons/pool2/impl/GenericObjectPool.html
==============================================================================
--- websites/production/commons/content/proper/commons-pool/apidocs/src-html/org/apache/commons/pool2/impl/GenericObjectPool.html (original)
+++ websites/production/commons/content/proper/commons-pool/apidocs/src-html/org/apache/commons/pool2/impl/GenericObjectPool.html Thu Feb 14 14:37:19 2019
@@ -305,904 +305,895 @@
<span class="sourceLineNo">297</span> * @see GenericObjectPoolConfig<a name="line.297"></a>
<span class="sourceLineNo">298</span> */<a name="line.298"></a>
<span class="sourceLineNo">299</span> public void setConfig(final GenericObjectPoolConfig<T> conf) {<a name="line.299"></a>
-<span class="sourceLineNo">300</span> setLifo(conf.getLifo());<a name="line.300"></a>
+<span class="sourceLineNo">300</span> super.setConfig(conf);<a name="line.300"></a>
<span class="sourceLineNo">301</span> setMaxIdle(conf.getMaxIdle());<a name="line.301"></a>
<span class="sourceLineNo">302</span> setMinIdle(conf.getMinIdle());<a name="line.302"></a>
<span class="sourceLineNo">303</span> setMaxTotal(conf.getMaxTotal());<a name="line.303"></a>
-<span class="sourceLineNo">304</span> setMaxWaitMillis(conf.getMaxWaitMillis());<a name="line.304"></a>
-<span class="sourceLineNo">305</span> setBlockWhenExhausted(conf.getBlockWhenExhausted());<a name="line.305"></a>
-<span class="sourceLineNo">306</span> setTestOnCreate(conf.getTestOnCreate());<a name="line.306"></a>
-<span class="sourceLineNo">307</span> setTestOnBorrow(conf.getTestOnBorrow());<a name="line.307"></a>
-<span class="sourceLineNo">308</span> setTestOnReturn(conf.getTestOnReturn());<a name="line.308"></a>
-<span class="sourceLineNo">309</span> setTestWhileIdle(conf.getTestWhileIdle());<a name="line.309"></a>
-<span class="sourceLineNo">310</span> setNumTestsPerEvictionRun(conf.getNumTestsPerEvictionRun());<a name="line.310"></a>
-<span class="sourceLineNo">311</span> setMinEvictableIdleTimeMillis(conf.getMinEvictableIdleTimeMillis());<a name="line.311"></a>
-<span class="sourceLineNo">312</span> setTimeBetweenEvictionRunsMillis(conf.getTimeBetweenEvictionRunsMillis());<a name="line.312"></a>
-<span class="sourceLineNo">313</span> setSoftMinEvictableIdleTimeMillis(conf.getSoftMinEvictableIdleTimeMillis());<a name="line.313"></a>
-<span class="sourceLineNo">314</span> final EvictionPolicy<T> policy = conf.getEvictionPolicy();<a name="line.314"></a>
-<span class="sourceLineNo">315</span> if (policy == null) {<a name="line.315"></a>
-<span class="sourceLineNo">316</span> // Use the class name (pre-2.6.0 compatible)<a name="line.316"></a>
-<span class="sourceLineNo">317</span> setEvictionPolicyClassName(conf.getEvictionPolicyClassName());<a name="line.317"></a>
-<span class="sourceLineNo">318</span> } else {<a name="line.318"></a>
-<span class="sourceLineNo">319</span> // Otherwise, use the class (2.6.0 feature)<a name="line.319"></a>
-<span class="sourceLineNo">320</span> setEvictionPolicy(policy);<a name="line.320"></a>
-<span class="sourceLineNo">321</span> }<a name="line.321"></a>
-<span class="sourceLineNo">322</span> setEvictorShutdownTimeoutMillis(conf.getEvictorShutdownTimeoutMillis());<a name="line.322"></a>
-<span class="sourceLineNo">323</span> }<a name="line.323"></a>
-<span class="sourceLineNo">324</span><a name="line.324"></a>
-<span class="sourceLineNo">325</span> /**<a name="line.325"></a>
-<span class="sourceLineNo">326</span> * Sets the abandoned object removal configuration.<a name="line.326"></a>
-<span class="sourceLineNo">327</span> *<a name="line.327"></a>
-<span class="sourceLineNo">328</span> * @param abandonedConfig the new configuration to use. This is used by value.<a name="line.328"></a>
-<span class="sourceLineNo">329</span> *<a name="line.329"></a>
-<span class="sourceLineNo">330</span> * @see AbandonedConfig<a name="line.330"></a>
-<span class="sourceLineNo">331</span> */<a name="line.331"></a>
-<span class="sourceLineNo">332</span> public void setAbandonedConfig(final AbandonedConfig abandonedConfig) {<a name="line.332"></a>
-<span class="sourceLineNo">333</span> if (abandonedConfig == null) {<a name="line.333"></a>
-<span class="sourceLineNo">334</span> this.abandonedConfig = null;<a name="line.334"></a>
-<span class="sourceLineNo">335</span> } else {<a name="line.335"></a>
-<span class="sourceLineNo">336</span> this.abandonedConfig = new AbandonedConfig();<a name="line.336"></a>
-<span class="sourceLineNo">337</span> this.abandonedConfig.setLogAbandoned(abandonedConfig.getLogAbandoned());<a name="line.337"></a>
-<span class="sourceLineNo">338</span> this.abandonedConfig.setLogWriter(abandonedConfig.getLogWriter());<a name="line.338"></a>
-<span class="sourceLineNo">339</span> this.abandonedConfig.setRemoveAbandonedOnBorrow(abandonedConfig.getRemoveAbandonedOnBorrow());<a name="line.339"></a>
-<span class="sourceLineNo">340</span> this.abandonedConfig.setRemoveAbandonedOnMaintenance(abandonedConfig.getRemoveAbandonedOnMaintenance());<a name="line.340"></a>
-<span class="sourceLineNo">341</span> this.abandonedConfig.setRemoveAbandonedTimeout(abandonedConfig.getRemoveAbandonedTimeout());<a name="line.341"></a>
-<span class="sourceLineNo">342</span> this.abandonedConfig.setUseUsageTracking(abandonedConfig.getUseUsageTracking());<a name="line.342"></a>
-<span class="sourceLineNo">343</span> this.abandonedConfig.setRequireFullStackTrace(abandonedConfig.getRequireFullStackTrace());<a name="line.343"></a>
-<span class="sourceLineNo">344</span> }<a name="line.344"></a>
-<span class="sourceLineNo">345</span> }<a name="line.345"></a>
-<span class="sourceLineNo">346</span><a name="line.346"></a>
-<span class="sourceLineNo">347</span> /**<a name="line.347"></a>
-<span class="sourceLineNo">348</span> * Obtains a reference to the factory used to create, destroy and validate<a name="line.348"></a>
-<span class="sourceLineNo">349</span> * the objects used by this pool.<a name="line.349"></a>
-<span class="sourceLineNo">350</span> *<a name="line.350"></a>
-<span class="sourceLineNo">351</span> * @return the factory<a name="line.351"></a>
-<span class="sourceLineNo">352</span> */<a name="line.352"></a>
-<span class="sourceLineNo">353</span> public PooledObjectFactory<T> getFactory() {<a name="line.353"></a>
-<span class="sourceLineNo">354</span> return factory;<a name="line.354"></a>
-<span class="sourceLineNo">355</span> }<a name="line.355"></a>
-<span class="sourceLineNo">356</span><a name="line.356"></a>
-<span class="sourceLineNo">357</span> /**<a name="line.357"></a>
-<span class="sourceLineNo">358</span> * Equivalent to <code>{@link #borrowObject(long)<a name="line.358"></a>
-<span class="sourceLineNo">359</span> * borrowObject}({@link #getMaxWaitMillis()})</code>.<a name="line.359"></a>
+<span class="sourceLineNo">304</span> }<a name="line.304"></a>
+<span class="sourceLineNo">305</span><a name="line.305"></a>
+<span class="sourceLineNo">306</span> /**<a name="line.306"></a>
+<span class="sourceLineNo">307</span> * Sets the abandoned object removal configuration.<a name="line.307"></a>
+<span class="sourceLineNo">308</span> *<a name="line.308"></a>
+<span class="sourceLineNo">309</span> * @param abandonedConfig the new configuration to use. This is used by value.<a name="line.309"></a>
+<span class="sourceLineNo">310</span> *<a name="line.310"></a>
+<span class="sourceLineNo">311</span> * @see AbandonedConfig<a name="line.311"></a>
+<span class="sourceLineNo">312</span> */<a name="line.312"></a>
+<span class="sourceLineNo">313</span> public void setAbandonedConfig(final AbandonedConfig abandonedConfig) {<a name="line.313"></a>
+<span class="sourceLineNo">314</span> if (abandonedConfig == null) {<a name="line.314"></a>
+<span class="sourceLineNo">315</span> this.abandonedConfig = null;<a name="line.315"></a>
+<span class="sourceLineNo">316</span> } else {<a name="line.316"></a>
+<span class="sourceLineNo">317</span> this.abandonedConfig = new AbandonedConfig();<a name="line.317"></a>
+<span class="sourceLineNo">318</span> this.abandonedConfig.setLogAbandoned(abandonedConfig.getLogAbandoned());<a name="line.318"></a>
+<span class="sourceLineNo">319</span> this.abandonedConfig.setLogWriter(abandonedConfig.getLogWriter());<a name="line.319"></a>
+<span class="sourceLineNo">320</span> this.abandonedConfig.setRemoveAbandonedOnBorrow(abandonedConfig.getRemoveAbandonedOnBorrow());<a name="line.320"></a>
+<span class="sourceLineNo">321</span> this.abandonedConfig.setRemoveAbandonedOnMaintenance(abandonedConfig.getRemoveAbandonedOnMaintenance());<a name="line.321"></a>
+<span class="sourceLineNo">322</span> this.abandonedConfig.setRemoveAbandonedTimeout(abandonedConfig.getRemoveAbandonedTimeout());<a name="line.322"></a>
+<span class="sourceLineNo">323</span> this.abandonedConfig.setUseUsageTracking(abandonedConfig.getUseUsageTracking());<a name="line.323"></a>
+<span class="sourceLineNo">324</span> this.abandonedConfig.setRequireFullStackTrace(abandonedConfig.getRequireFullStackTrace());<a name="line.324"></a>
+<span class="sourceLineNo">325</span> }<a name="line.325"></a>
+<span class="sourceLineNo">326</span> }<a name="line.326"></a>
+<span class="sourceLineNo">327</span><a name="line.327"></a>
+<span class="sourceLineNo">328</span> /**<a name="line.328"></a>
+<span class="sourceLineNo">329</span> * Obtains a reference to the factory used to create, destroy and validate<a name="line.329"></a>
+<span class="sourceLineNo">330</span> * the objects used by this pool.<a name="line.330"></a>
+<span class="sourceLineNo">331</span> *<a name="line.331"></a>
+<span class="sourceLineNo">332</span> * @return the factory<a name="line.332"></a>
+<span class="sourceLineNo">333</span> */<a name="line.333"></a>
+<span class="sourceLineNo">334</span> public PooledObjectFactory<T> getFactory() {<a name="line.334"></a>
+<span class="sourceLineNo">335</span> return factory;<a name="line.335"></a>
+<span class="sourceLineNo">336</span> }<a name="line.336"></a>
+<span class="sourceLineNo">337</span><a name="line.337"></a>
+<span class="sourceLineNo">338</span> /**<a name="line.338"></a>
+<span class="sourceLineNo">339</span> * Equivalent to <code>{@link #borrowObject(long)<a name="line.339"></a>
+<span class="sourceLineNo">340</span> * borrowObject}({@link #getMaxWaitMillis()})</code>.<a name="line.340"></a>
+<span class="sourceLineNo">341</span> * <p><a name="line.341"></a>
+<span class="sourceLineNo">342</span> * {@inheritDoc}<a name="line.342"></a>
+<span class="sourceLineNo">343</span> */<a name="line.343"></a>
+<span class="sourceLineNo">344</span> @Override<a name="line.344"></a>
+<span class="sourceLineNo">345</span> public T borrowObject() throws Exception {<a name="line.345"></a>
+<span class="sourceLineNo">346</span> return borrowObject(getMaxWaitMillis());<a name="line.346"></a>
+<span class="sourceLineNo">347</span> }<a name="line.347"></a>
+<span class="sourceLineNo">348</span><a name="line.348"></a>
+<span class="sourceLineNo">349</span> /**<a name="line.349"></a>
+<span class="sourceLineNo">350</span> * Borrows an object from the pool using the specific waiting time which only<a name="line.350"></a>
+<span class="sourceLineNo">351</span> * applies if {@link #getBlockWhenExhausted()} is true.<a name="line.351"></a>
+<span class="sourceLineNo">352</span> * <p><a name="line.352"></a>
+<span class="sourceLineNo">353</span> * If there is one or more idle instance available in the pool, then an<a name="line.353"></a>
+<span class="sourceLineNo">354</span> * idle instance will be selected based on the value of {@link #getLifo()},<a name="line.354"></a>
+<span class="sourceLineNo">355</span> * activated and returned. If activation fails, or {@link #getTestOnBorrow()<a name="line.355"></a>
+<span class="sourceLineNo">356</span> * testOnBorrow} is set to <code>true</code> and validation fails, the<a name="line.356"></a>
+<span class="sourceLineNo">357</span> * instance is destroyed and the next available instance is examined. This<a name="line.357"></a>
+<span class="sourceLineNo">358</span> * continues until either a valid instance is returned or there are no more<a name="line.358"></a>
+<span class="sourceLineNo">359</span> * idle instances available.<a name="line.359"></a>
<span class="sourceLineNo">360</span> * <p><a name="line.360"></a>
-<span class="sourceLineNo">361</span> * {@inheritDoc}<a name="line.361"></a>
-<span class="sourceLineNo">362</span> */<a name="line.362"></a>
-<span class="sourceLineNo">363</span> @Override<a name="line.363"></a>
-<span class="sourceLineNo">364</span> public T borrowObject() throws Exception {<a name="line.364"></a>
-<span class="sourceLineNo">365</span> return borrowObject(getMaxWaitMillis());<a name="line.365"></a>
-<span class="sourceLineNo">366</span> }<a name="line.366"></a>
-<span class="sourceLineNo">367</span><a name="line.367"></a>
-<span class="sourceLineNo">368</span> /**<a name="line.368"></a>
-<span class="sourceLineNo">369</span> * Borrows an object from the pool using the specific waiting time which only<a name="line.369"></a>
-<span class="sourceLineNo">370</span> * applies if {@link #getBlockWhenExhausted()} is true.<a name="line.370"></a>
-<span class="sourceLineNo">371</span> * <p><a name="line.371"></a>
-<span class="sourceLineNo">372</span> * If there is one or more idle instance available in the pool, then an<a name="line.372"></a>
-<span class="sourceLineNo">373</span> * idle instance will be selected based on the value of {@link #getLifo()},<a name="line.373"></a>
-<span class="sourceLineNo">374</span> * activated and returned. If activation fails, or {@link #getTestOnBorrow()<a name="line.374"></a>
-<span class="sourceLineNo">375</span> * testOnBorrow} is set to <code>true</code> and validation fails, the<a name="line.375"></a>
-<span class="sourceLineNo">376</span> * instance is destroyed and the next available instance is examined. This<a name="line.376"></a>
-<span class="sourceLineNo">377</span> * continues until either a valid instance is returned or there are no more<a name="line.377"></a>
-<span class="sourceLineNo">378</span> * idle instances available.<a name="line.378"></a>
-<span class="sourceLineNo">379</span> * <p><a name="line.379"></a>
-<span class="sourceLineNo">380</span> * If there are no idle instances available in the pool, behavior depends on<a name="line.380"></a>
-<span class="sourceLineNo">381</span> * the {@link #getMaxTotal() maxTotal}, (if applicable)<a name="line.381"></a>
-<span class="sourceLineNo">382</span> * {@link #getBlockWhenExhausted()} and the value passed in to the<a name="line.382"></a>
-<span class="sourceLineNo">383</span> * <code>borrowMaxWaitMillis</code> parameter. If the number of instances<a name="line.383"></a>
-<span class="sourceLineNo">384</span> * checked out from the pool is less than <code>maxTotal,</code> a new<a name="line.384"></a>
-<span class="sourceLineNo">385</span> * instance is created, activated and (if applicable) validated and returned<a name="line.385"></a>
-<span class="sourceLineNo">386</span> * to the caller. If validation fails, a <code>NoSuchElementException</code><a name="line.386"></a>
-<span class="sourceLineNo">387</span> * is thrown.<a name="line.387"></a>
-<span class="sourceLineNo">388</span> * <p><a name="line.388"></a>
-<span class="sourceLineNo">389</span> * If the pool is exhausted (no available idle instances and no capacity to<a name="line.389"></a>
-<span class="sourceLineNo">390</span> * create new ones), this method will either block (if<a name="line.390"></a>
-<span class="sourceLineNo">391</span> * {@link #getBlockWhenExhausted()} is true) or throw a<a name="line.391"></a>
-<span class="sourceLineNo">392</span> * <code>NoSuchElementException</code> (if<a name="line.392"></a>
-<span class="sourceLineNo">393</span> * {@link #getBlockWhenExhausted()} is false). The length of time that this<a name="line.393"></a>
-<span class="sourceLineNo">394</span> * method will block when {@link #getBlockWhenExhausted()} is true is<a name="line.394"></a>
-<span class="sourceLineNo">395</span> * determined by the value passed in to the <code>borrowMaxWaitMillis</code><a name="line.395"></a>
-<span class="sourceLineNo">396</span> * parameter.<a name="line.396"></a>
-<span class="sourceLineNo">397</span> * <p><a name="line.397"></a>
-<span class="sourceLineNo">398</span> * When the pool is exhausted, multiple calling threads may be<a name="line.398"></a>
-<span class="sourceLineNo">399</span> * simultaneously blocked waiting for instances to become available. A<a name="line.399"></a>
-<span class="sourceLineNo">400</span> * "fairness" algorithm has been implemented to ensure that threads receive<a name="line.400"></a>
-<span class="sourceLineNo">401</span> * available instances in request arrival order.<a name="line.401"></a>
-<span class="sourceLineNo">402</span> *<a name="line.402"></a>
-<span class="sourceLineNo">403</span> * @param borrowMaxWaitMillis The time to wait in milliseconds for an object<a name="line.403"></a>
-<span class="sourceLineNo">404</span> * to become available<a name="line.404"></a>
-<span class="sourceLineNo">405</span> *<a name="line.405"></a>
-<span class="sourceLineNo">406</span> * @return object instance from the pool<a name="line.406"></a>
-<span class="sourceLineNo">407</span> *<a name="line.407"></a>
-<span class="sourceLineNo">408</span> * @throws NoSuchElementException if an instance cannot be returned<a name="line.408"></a>
-<span class="sourceLineNo">409</span> *<a name="line.409"></a>
-<span class="sourceLineNo">410</span> * @throws Exception if an object instance cannot be returned due to an<a name="line.410"></a>
-<span class="sourceLineNo">411</span> * error<a name="line.411"></a>
-<span class="sourceLineNo">412</span> */<a name="line.412"></a>
-<span class="sourceLineNo">413</span> public T borrowObject(final long borrowMaxWaitMillis) throws Exception {<a name="line.413"></a>
-<span class="sourceLineNo">414</span> assertOpen();<a name="line.414"></a>
-<span class="sourceLineNo">415</span><a name="line.415"></a>
-<span class="sourceLineNo">416</span> final AbandonedConfig ac = this.abandonedConfig;<a name="line.416"></a>
-<span class="sourceLineNo">417</span> if (ac != null && ac.getRemoveAbandonedOnBorrow() &&<a name="line.417"></a>
-<span class="sourceLineNo">418</span> (getNumIdle() < 2) &&<a name="line.418"></a>
-<span class="sourceLineNo">419</span> (getNumActive() > getMaxTotal() - 3) ) {<a name="line.419"></a>
-<span class="sourceLineNo">420</span> removeAbandoned(ac);<a name="line.420"></a>
-<span class="sourceLineNo">421</span> }<a name="line.421"></a>
-<span class="sourceLineNo">422</span><a name="line.422"></a>
-<span class="sourceLineNo">423</span> PooledObject<T> p = null;<a name="line.423"></a>
-<span class="sourceLineNo">424</span><a name="line.424"></a>
-<span class="sourceLineNo">425</span> // Get local copy of current config so it is consistent for entire<a name="line.425"></a>
-<span class="sourceLineNo">426</span> // method execution<a name="line.426"></a>
-<span class="sourceLineNo">427</span> final boolean blockWhenExhausted = getBlockWhenExhausted();<a name="line.427"></a>
-<span class="sourceLineNo">428</span><a name="line.428"></a>
-<span class="sourceLineNo">429</span> boolean create;<a name="line.429"></a>
-<span class="sourceLineNo">430</span> final long waitTime = System.currentTimeMillis();<a name="line.430"></a>
-<span class="sourceLineNo">431</span><a name="line.431"></a>
-<span class="sourceLineNo">432</span> while (p == null) {<a name="line.432"></a>
-<span class="sourceLineNo">433</span> create = false;<a name="line.433"></a>
-<span class="sourceLineNo">434</span> p = idleObjects.pollFirst();<a name="line.434"></a>
-<span class="sourceLineNo">435</span> if (p == null) {<a name="line.435"></a>
-<span class="sourceLineNo">436</span> p = create();<a name="line.436"></a>
-<span class="sourceLineNo">437</span> if (p != null) {<a name="line.437"></a>
-<span class="sourceLineNo">438</span> create = true;<a name="line.438"></a>
-<span class="sourceLineNo">439</span> }<a name="line.439"></a>
-<span class="sourceLineNo">440</span> }<a name="line.440"></a>
-<span class="sourceLineNo">441</span> if (blockWhenExhausted) {<a name="line.441"></a>
-<span class="sourceLineNo">442</span> if (p == null) {<a name="line.442"></a>
-<span class="sourceLineNo">443</span> if (borrowMaxWaitMillis < 0) {<a name="line.443"></a>
-<span class="sourceLineNo">444</span> p = idleObjects.takeFirst();<a name="line.444"></a>
-<span class="sourceLineNo">445</span> } else {<a name="line.445"></a>
-<span class="sourceLineNo">446</span> p = idleObjects.pollFirst(borrowMaxWaitMillis,<a name="line.446"></a>
-<span class="sourceLineNo">447</span> TimeUnit.MILLISECONDS);<a name="line.447"></a>
-<span class="sourceLineNo">448</span> }<a name="line.448"></a>
-<span class="sourceLineNo">449</span> }<a name="line.449"></a>
-<span class="sourceLineNo">450</span> if (p == null) {<a name="line.450"></a>
-<span class="sourceLineNo">451</span> throw new NoSuchElementException(<a name="line.451"></a>
-<span class="sourceLineNo">452</span> "Timeout waiting for idle object");<a name="line.452"></a>
-<span class="sourceLineNo">453</span> }<a name="line.453"></a>
-<span class="sourceLineNo">454</span> } else {<a name="line.454"></a>
-<span class="sourceLineNo">455</span> if (p == null) {<a name="line.455"></a>
-<span class="sourceLineNo">456</span> throw new NoSuchElementException("Pool exhausted");<a name="line.456"></a>
-<span class="sourceLineNo">457</span> }<a name="line.457"></a>
-<span class="sourceLineNo">458</span> }<a name="line.458"></a>
-<span class="sourceLineNo">459</span> if (!p.allocate()) {<a name="line.459"></a>
-<span class="sourceLineNo">460</span> p = null;<a name="line.460"></a>
-<span class="sourceLineNo">461</span> }<a name="line.461"></a>
-<span class="sourceLineNo">462</span><a name="line.462"></a>
-<span class="sourceLineNo">463</span> if (p != null) {<a name="line.463"></a>
-<span class="sourceLineNo">464</span> try {<a name="line.464"></a>
-<span class="sourceLineNo">465</span> factory.activateObject(p);<a name="line.465"></a>
-<span class="sourceLineNo">466</span> } catch (final Exception e) {<a name="line.466"></a>
-<span class="sourceLineNo">467</span> try {<a name="line.467"></a>
-<span class="sourceLineNo">468</span> destroy(p);<a name="line.468"></a>
-<span class="sourceLineNo">469</span> } catch (final Exception e1) {<a name="line.469"></a>
-<span class="sourceLineNo">470</span> // Ignore - activation failure is more important<a name="line.470"></a>
-<span class="sourceLineNo">471</span> }<a name="line.471"></a>
-<span class="sourceLineNo">472</span> p = null;<a name="line.472"></a>
-<span class="sourceLineNo">473</span> if (create) {<a name="line.473"></a>
-<span class="sourceLineNo">474</span> final NoSuchElementException nsee = new NoSuchElementException(<a name="line.474"></a>
-<span class="sourceLineNo">475</span> "Unable to activate object");<a name="line.475"></a>
-<span class="sourceLineNo">476</span> nsee.initCause(e);<a name="line.476"></a>
-<span class="sourceLineNo">477</span> throw nsee;<a name="line.477"></a>
-<span class="sourceLineNo">478</span> }<a name="line.478"></a>
-<span class="sourceLineNo">479</span> }<a name="line.479"></a>
-<span class="sourceLineNo">480</span> if (p != null && (getTestOnBorrow() || create && getTestOnCreate())) {<a name="line.480"></a>
-<span class="sourceLineNo">481</span> boolean validate = false;<a name="line.481"></a>
-<span class="sourceLineNo">482</span> Throwable validationThrowable = null;<a name="line.482"></a>
-<span class="sourceLineNo">483</span> try {<a name="line.483"></a>
-<span class="sourceLineNo">484</span> validate = factory.validateObject(p);<a name="line.484"></a>
-<span class="sourceLineNo">485</span> } catch (final Throwable t) {<a name="line.485"></a>
-<span class="sourceLineNo">486</span> PoolUtils.checkRethrow(t);<a name="line.486"></a>
-<span class="sourceLineNo">487</span> validationThrowable = t;<a name="line.487"></a>
-<span class="sourceLineNo">488</span> }<a name="line.488"></a>
-<span class="sourceLineNo">489</span> if (!validate) {<a name="line.489"></a>
-<span class="sourceLineNo">490</span> try {<a name="line.490"></a>
-<span class="sourceLineNo">491</span> destroy(p);<a name="line.491"></a>
-<span class="sourceLineNo">492</span> destroyedByBorrowValidationCount.incrementAndGet();<a name="line.492"></a>
-<span class="sourceLineNo">493</span> } catch (final Exception e) {<a name="line.493"></a>
-<span class="sourceLineNo">494</span> // Ignore - validation failure is more important<a name="line.494"></a>
-<span class="sourceLineNo">495</span> }<a name="line.495"></a>
-<span class="sourceLineNo">496</span> p = null;<a name="line.496"></a>
-<span class="sourceLineNo">497</span> if (create) {<a name="line.497"></a>
-<span class="sourceLineNo">498</span> final NoSuchElementException nsee = new NoSuchElementException(<a name="line.498"></a>
-<span class="sourceLineNo">499</span> "Unable to validate object");<a name="line.499"></a>
-<span class="sourceLineNo">500</span> nsee.initCause(validationThrowable);<a name="line.500"></a>
-<span class="sourceLineNo">501</span> throw nsee;<a name="line.501"></a>
-<span class="sourceLineNo">502</span> }<a name="line.502"></a>
-<span class="sourceLineNo">503</span> }<a name="line.503"></a>
-<span class="sourceLineNo">504</span> }<a name="line.504"></a>
-<span class="sourceLineNo">505</span> }<a name="line.505"></a>
-<span class="sourceLineNo">506</span> }<a name="line.506"></a>
-<span class="sourceLineNo">507</span><a name="line.507"></a>
-<span class="sourceLineNo">508</span> updateStatsBorrow(p, System.currentTimeMillis() - waitTime);<a name="line.508"></a>
-<span class="sourceLineNo">509</span><a name="line.509"></a>
-<span class="sourceLineNo">510</span> return p.getObject();<a name="line.510"></a>
-<span class="sourceLineNo">511</span> }<a name="line.511"></a>
-<span class="sourceLineNo">512</span><a name="line.512"></a>
-<span class="sourceLineNo">513</span> /**<a name="line.513"></a>
-<span class="sourceLineNo">514</span> * {@inheritDoc}<a name="line.514"></a>
-<span class="sourceLineNo">515</span> * <p><a name="line.515"></a>
-<span class="sourceLineNo">516</span> * If {@link #getMaxIdle() maxIdle} is set to a positive value and the<a name="line.516"></a>
-<span class="sourceLineNo">517</span> * number of idle instances has reached this value, the returning instance<a name="line.517"></a>
-<span class="sourceLineNo">518</span> * is destroyed.<a name="line.518"></a>
-<span class="sourceLineNo">519</span> * <p><a name="line.519"></a>
-<span class="sourceLineNo">520</span> * If {@link #getTestOnReturn() testOnReturn} == true, the returning<a name="line.520"></a>
-<span class="sourceLineNo">521</span> * instance is validated before being returned to the idle instance pool. In<a name="line.521"></a>
-<span class="sourceLineNo">522</span> * this case, if validation fails, the instance is destroyed.<a name="line.522"></a>
-<span class="sourceLineNo">523</span> * <p><a name="line.523"></a>
-<span class="sourceLineNo">524</span> * Exceptions encountered destroying objects for any reason are swallowed<a name="line.524"></a>
-<span class="sourceLineNo">525</span> * but notified via a {@link SwallowedExceptionListener}.<a name="line.525"></a>
-<span class="sourceLineNo">526</span> */<a name="line.526"></a>
-<span class="sourceLineNo">527</span> @Override<a name="line.527"></a>
-<span class="sourceLineNo">528</span> public void returnObject(final T obj) {<a name="line.528"></a>
-<span class="sourceLineNo">529</span> final PooledObject<T> p = allObjects.get(new IdentityWrapper<>(obj));<a name="line.529"></a>
-<span class="sourceLineNo">530</span><a name="line.530"></a>
-<span class="sourceLineNo">531</span> if (p == null) {<a name="line.531"></a>
-<span class="sourceLineNo">532</span> if (!isAbandonedConfig()) {<a name="line.532"></a>
-<span class="sourceLineNo">533</span> throw new IllegalStateException(<a name="line.533"></a>
-<span class="sourceLineNo">534</span> "Returned object not currently part of this pool");<a name="line.534"></a>
-<span class="sourceLineNo">535</span> }<a name="line.535"></a>
-<span class="sourceLineNo">536</span> return; // Object was abandoned and removed<a name="line.536"></a>
+<span class="sourceLineNo">361</span> * If there are no idle instances available in the pool, behavior depends on<a name="line.361"></a>
+<span class="sourceLineNo">362</span> * the {@link #getMaxTotal() maxTotal}, (if applicable)<a name="line.362"></a>
+<span class="sourceLineNo">363</span> * {@link #getBlockWhenExhausted()} and the value passed in to the<a name="line.363"></a>
+<span class="sourceLineNo">364</span> * <code>borrowMaxWaitMillis</code> parameter. If the number of instances<a name="line.364"></a>
+<span class="sourceLineNo">365</span> * checked out from the pool is less than <code>maxTotal,</code> a new<a name="line.365"></a>
+<span class="sourceLineNo">366</span> * instance is created, activated and (if applicable) validated and returned<a name="line.366"></a>
+<span class="sourceLineNo">367</span> * to the caller. If validation fails, a <code>NoSuchElementException</code><a name="line.367"></a>
+<span class="sourceLineNo">368</span> * is thrown.<a name="line.368"></a>
+<span class="sourceLineNo">369</span> * <p><a name="line.369"></a>
+<span class="sourceLineNo">370</span> * If the pool is exhausted (no available idle instances and no capacity to<a name="line.370"></a>
+<span class="sourceLineNo">371</span> * create new ones), this method will either block (if<a name="line.371"></a>
+<span class="sourceLineNo">372</span> * {@link #getBlockWhenExhausted()} is true) or throw a<a name="line.372"></a>
+<span class="sourceLineNo">373</span> * <code>NoSuchElementException</code> (if<a name="line.373"></a>
+<span class="sourceLineNo">374</span> * {@link #getBlockWhenExhausted()} is false). The length of time that this<a name="line.374"></a>
+<span class="sourceLineNo">375</span> * method will block when {@link #getBlockWhenExhausted()} is true is<a name="line.375"></a>
+<span class="sourceLineNo">376</span> * determined by the value passed in to the <code>borrowMaxWaitMillis</code><a name="line.376"></a>
+<span class="sourceLineNo">377</span> * parameter.<a name="line.377"></a>
+<span class="sourceLineNo">378</span> * <p><a name="line.378"></a>
+<span class="sourceLineNo">379</span> * When the pool is exhausted, multiple calling threads may be<a name="line.379"></a>
+<span class="sourceLineNo">380</span> * simultaneously blocked waiting for instances to become available. A<a name="line.380"></a>
+<span class="sourceLineNo">381</span> * "fairness" algorithm has been implemented to ensure that threads receive<a name="line.381"></a>
+<span class="sourceLineNo">382</span> * available instances in request arrival order.<a name="line.382"></a>
+<span class="sourceLineNo">383</span> *<a name="line.383"></a>
+<span class="sourceLineNo">384</span> * @param borrowMaxWaitMillis The time to wait in milliseconds for an object<a name="line.384"></a>
+<span class="sourceLineNo">385</span> * to become available<a name="line.385"></a>
+<span class="sourceLineNo">386</span> *<a name="line.386"></a>
+<span class="sourceLineNo">387</span> * @return object instance from the pool<a name="line.387"></a>
+<span class="sourceLineNo">388</span> *<a name="line.388"></a>
+<span class="sourceLineNo">389</span> * @throws NoSuchElementException if an instance cannot be returned<a name="line.389"></a>
+<span class="sourceLineNo">390</span> *<a name="line.390"></a>
+<span class="sourceLineNo">391</span> * @throws Exception if an object instance cannot be returned due to an<a name="line.391"></a>
+<span class="sourceLineNo">392</span> * error<a name="line.392"></a>
+<span class="sourceLineNo">393</span> */<a name="line.393"></a>
+<span class="sourceLineNo">394</span> public T borrowObject(final long borrowMaxWaitMillis) throws Exception {<a name="line.394"></a>
+<span class="sourceLineNo">395</span> assertOpen();<a name="line.395"></a>
+<span class="sourceLineNo">396</span><a name="line.396"></a>
+<span class="sourceLineNo">397</span> final AbandonedConfig ac = this.abandonedConfig;<a name="line.397"></a>
+<span class="sourceLineNo">398</span> if (ac != null && ac.getRemoveAbandonedOnBorrow() &&<a name="line.398"></a>
+<span class="sourceLineNo">399</span> (getNumIdle() < 2) &&<a name="line.399"></a>
+<span class="sourceLineNo">400</span> (getNumActive() > getMaxTotal() - 3) ) {<a name="line.400"></a>
+<span class="sourceLineNo">401</span> removeAbandoned(ac);<a name="line.401"></a>
+<span class="sourceLineNo">402</span> }<a name="line.402"></a>
+<span class="sourceLineNo">403</span><a name="line.403"></a>
+<span class="sourceLineNo">404</span> PooledObject<T> p = null;<a name="line.404"></a>
+<span class="sourceLineNo">405</span><a name="line.405"></a>
+<span class="sourceLineNo">406</span> // Get local copy of current config so it is consistent for entire<a name="line.406"></a>
+<span class="sourceLineNo">407</span> // method execution<a name="line.407"></a>
+<span class="sourceLineNo">408</span> final boolean blockWhenExhausted = getBlockWhenExhausted();<a name="line.408"></a>
+<span class="sourceLineNo">409</span><a name="line.409"></a>
+<span class="sourceLineNo">410</span> boolean create;<a name="line.410"></a>
+<span class="sourceLineNo">411</span> final long waitTime = System.currentTimeMillis();<a name="line.411"></a>
+<span class="sourceLineNo">412</span><a name="line.412"></a>
+<span class="sourceLineNo">413</span> while (p == null) {<a name="line.413"></a>
+<span class="sourceLineNo">414</span> create = false;<a name="line.414"></a>
+<span class="sourceLineNo">415</span> p = idleObjects.pollFirst();<a name="line.415"></a>
+<span class="sourceLineNo">416</span> if (p == null) {<a name="line.416"></a>
+<span class="sourceLineNo">417</span> p = create();<a name="line.417"></a>
+<span class="sourceLineNo">418</span> if (p != null) {<a name="line.418"></a>
+<span class="sourceLineNo">419</span> create = true;<a name="line.419"></a>
+<span class="sourceLineNo">420</span> }<a name="line.420"></a>
+<span class="sourceLineNo">421</span> }<a name="line.421"></a>
+<span class="sourceLineNo">422</span> if (blockWhenExhausted) {<a name="line.422"></a>
+<span class="sourceLineNo">423</span> if (p == null) {<a name="line.423"></a>
+<span class="sourceLineNo">424</span> if (borrowMaxWaitMillis < 0) {<a name="line.424"></a>
+<span class="sourceLineNo">425</span> p = idleObjects.takeFirst();<a name="line.425"></a>
+<span class="sourceLineNo">426</span> } else {<a name="line.426"></a>
+<span class="sourceLineNo">427</span> p = idleObjects.pollFirst(borrowMaxWaitMillis,<a name="line.427"></a>
+<span class="sourceLineNo">428</span> TimeUnit.MILLISECONDS);<a name="line.428"></a>
+<span class="sourceLineNo">429</span> }<a name="line.429"></a>
+<span class="sourceLineNo">430</span> }<a name="line.430"></a>
+<span class="sourceLineNo">431</span> if (p == null) {<a name="line.431"></a>
+<span class="sourceLineNo">432</span> throw new NoSuchElementException(<a name="line.432"></a>
+<span class="sourceLineNo">433</span> "Timeout waiting for idle object");<a name="line.433"></a>
+<span class="sourceLineNo">434</span> }<a name="line.434"></a>
+<span class="sourceLineNo">435</span> } else {<a name="line.435"></a>
+<span class="sourceLineNo">436</span> if (p == null) {<a name="line.436"></a>
+<span class="sourceLineNo">437</span> throw new NoSuchElementException("Pool exhausted");<a name="line.437"></a>
+<span class="sourceLineNo">438</span> }<a name="line.438"></a>
+<span class="sourceLineNo">439</span> }<a name="line.439"></a>
+<span class="sourceLineNo">440</span> if (!p.allocate()) {<a name="line.440"></a>
+<span class="sourceLineNo">441</span> p = null;<a name="line.441"></a>
+<span class="sourceLineNo">442</span> }<a name="line.442"></a>
+<span class="sourceLineNo">443</span><a name="line.443"></a>
+<span class="sourceLineNo">444</span> if (p != null) {<a name="line.444"></a>
+<span class="sourceLineNo">445</span> try {<a name="line.445"></a>
+<span class="sourceLineNo">446</span> factory.activateObject(p);<a name="line.446"></a>
+<span class="sourceLineNo">447</span> } catch (final Exception e) {<a name="line.447"></a>
+<span class="sourceLineNo">448</span> try {<a name="line.448"></a>
+<span class="sourceLineNo">449</span> destroy(p);<a name="line.449"></a>
+<span class="sourceLineNo">450</span> } catch (final Exception e1) {<a name="line.450"></a>
+<span class="sourceLineNo">451</span> // Ignore - activation failure is more important<a name="line.451"></a>
+<span class="sourceLineNo">452</span> }<a name="line.452"></a>
+<span class="sourceLineNo">453</span> p = null;<a name="line.453"></a>
+<span class="sourceLineNo">454</span> if (create) {<a name="line.454"></a>
+<span class="sourceLineNo">455</span> final NoSuchElementException nsee = new NoSuchElementException(<a name="line.455"></a>
+<span class="sourceLineNo">456</span> "Unable to activate object");<a name="line.456"></a>
+<span class="sourceLineNo">457</span> nsee.initCause(e);<a name="line.457"></a>
+<span class="sourceLineNo">458</span> throw nsee;<a name="line.458"></a>
+<span class="sourceLineNo">459</span> }<a name="line.459"></a>
+<span class="sourceLineNo">460</span> }<a name="line.460"></a>
+<span class="sourceLineNo">461</span> if (p != null && (getTestOnBorrow() || create && getTestOnCreate())) {<a name="line.461"></a>
+<span class="sourceLineNo">462</span> boolean validate = false;<a name="line.462"></a>
+<span class="sourceLineNo">463</span> Throwable validationThrowable = null;<a name="line.463"></a>
+<span class="sourceLineNo">464</span> try {<a name="line.464"></a>
+<span class="sourceLineNo">465</span> validate = factory.validateObject(p);<a name="line.465"></a>
+<span class="sourceLineNo">466</span> } catch (final Throwable t) {<a name="line.466"></a>
+<span class="sourceLineNo">467</span> PoolUtils.checkRethrow(t);<a name="line.467"></a>
+<span class="sourceLineNo">468</span> validationThrowable = t;<a name="line.468"></a>
+<span class="sourceLineNo">469</span> }<a name="line.469"></a>
+<span class="sourceLineNo">470</span> if (!validate) {<a name="line.470"></a>
+<span class="sourceLineNo">471</span> try {<a name="line.471"></a>
+<span class="sourceLineNo">472</span> destroy(p);<a name="line.472"></a>
+<span class="sourceLineNo">473</span> destroyedByBorrowValidationCount.incrementAndGet();<a name="line.473"></a>
+<span class="sourceLineNo">474</span> } catch (final Exception e) {<a name="line.474"></a>
+<span class="sourceLineNo">475</span> // Ignore - validation failure is more important<a name="line.475"></a>
+<span class="sourceLineNo">476</span> }<a name="line.476"></a>
+<span class="sourceLineNo">477</span> p = null;<a name="line.477"></a>
+<span class="sourceLineNo">478</span> if (create) {<a name="line.478"></a>
+<span class="sourceLineNo">479</span> final NoSuchElementException nsee = new NoSuchElementException(<a name="line.479"></a>
+<span class="sourceLineNo">480</span> "Unable to validate object");<a name="line.480"></a>
+<span class="sourceLineNo">481</span> nsee.initCause(validationThrowable);<a name="line.481"></a>
+<span class="sourceLineNo">482</span> throw nsee;<a name="line.482"></a>
+<span class="sourceLineNo">483</span> }<a name="line.483"></a>
+<span class="sourceLineNo">484</span> }<a name="line.484"></a>
+<span class="sourceLineNo">485</span> }<a name="line.485"></a>
+<span class="sourceLineNo">486</span> }<a name="line.486"></a>
+<span class="sourceLineNo">487</span> }<a name="line.487"></a>
+<span class="sourceLineNo">488</span><a name="line.488"></a>
+<span class="sourceLineNo">489</span> updateStatsBorrow(p, System.currentTimeMillis() - waitTime);<a name="line.489"></a>
+<span class="sourceLineNo">490</span><a name="line.490"></a>
+<span class="sourceLineNo">491</span> return p.getObject();<a name="line.491"></a>
+<span class="sourceLineNo">492</span> }<a name="line.492"></a>
+<span class="sourceLineNo">493</span><a name="line.493"></a>
+<span class="sourceLineNo">494</span> /**<a name="line.494"></a>
+<span class="sourceLineNo">495</span> * {@inheritDoc}<a name="line.495"></a>
+<span class="sourceLineNo">496</span> * <p><a name="line.496"></a>
+<span class="sourceLineNo">497</span> * If {@link #getMaxIdle() maxIdle} is set to a positive value and the<a name="line.497"></a>
+<span class="sourceLineNo">498</span> * number of idle instances has reached this value, the returning instance<a name="line.498"></a>
+<span class="sourceLineNo">499</span> * is destroyed.<a name="line.499"></a>
+<span class="sourceLineNo">500</span> * <p><a name="line.500"></a>
+<span class="sourceLineNo">501</span> * If {@link #getTestOnReturn() testOnReturn} == true, the returning<a name="line.501"></a>
+<span class="sourceLineNo">502</span> * instance is validated before being returned to the idle instance pool. In<a name="line.502"></a>
+<span class="sourceLineNo">503</span> * this case, if validation fails, the instance is destroyed.<a name="line.503"></a>
+<span class="sourceLineNo">504</span> * <p><a name="line.504"></a>
+<span class="sourceLineNo">505</span> * Exceptions encountered destroying objects for any reason are swallowed<a name="line.505"></a>
+<span class="sourceLineNo">506</span> * but notified via a {@link SwallowedExceptionListener}.<a name="line.506"></a>
+<span class="sourceLineNo">507</span> */<a name="line.507"></a>
+<span class="sourceLineNo">508</span> @Override<a name="line.508"></a>
+<span class="sourceLineNo">509</span> public void returnObject(final T obj) {<a name="line.509"></a>
+<span class="sourceLineNo">510</span> final PooledObject<T> p = allObjects.get(new IdentityWrapper<>(obj));<a name="line.510"></a>
+<span class="sourceLineNo">511</span><a name="line.511"></a>
+<span class="sourceLineNo">512</span> if (p == null) {<a name="line.512"></a>
+<span class="sourceLineNo">513</span> if (!isAbandonedConfig()) {<a name="line.513"></a>
+<span class="sourceLineNo">514</span> throw new IllegalStateException(<a name="line.514"></a>
+<span class="sourceLineNo">515</span> "Returned object not currently part of this pool");<a name="line.515"></a>
+<span class="sourceLineNo">516</span> }<a name="line.516"></a>
+<span class="sourceLineNo">517</span> return; // Object was abandoned and removed<a name="line.517"></a>
+<span class="sourceLineNo">518</span> }<a name="line.518"></a>
+<span class="sourceLineNo">519</span><a name="line.519"></a>
+<span class="sourceLineNo">520</span> markReturningState(p);<a name="line.520"></a>
+<span class="sourceLineNo">521</span><a name="line.521"></a>
+<span class="sourceLineNo">522</span> final long activeTime = p.getActiveTimeMillis();<a name="line.522"></a>
+<span class="sourceLineNo">523</span><a name="line.523"></a>
+<span class="sourceLineNo">524</span> if (getTestOnReturn() && !factory.validateObject(p)) {<a name="line.524"></a>
+<span class="sourceLineNo">525</span> try {<a name="line.525"></a>
+<span class="sourceLineNo">526</span> destroy(p);<a name="line.526"></a>
+<span class="sourceLineNo">527</span> } catch (final Exception e) {<a name="line.527"></a>
+<span class="sourceLineNo">528</span> swallowException(e);<a name="line.528"></a>
+<span class="sourceLineNo">529</span> }<a name="line.529"></a>
+<span class="sourceLineNo">530</span> try {<a name="line.530"></a>
+<span class="sourceLineNo">531</span> ensureIdle(1, false);<a name="line.531"></a>
+<span class="sourceLineNo">532</span> } catch (final Exception e) {<a name="line.532"></a>
+<span class="sourceLineNo">533</span> swallowException(e);<a name="line.533"></a>
+<span class="sourceLineNo">534</span> }<a name="line.534"></a>
+<span class="sourceLineNo">535</span> updateStatsReturn(activeTime);<a name="line.535"></a>
+<span class="sourceLineNo">536</span> return;<a name="line.536"></a>
<span class="sourceLineNo">537</span> }<a name="line.537"></a>
<span class="sourceLineNo">538</span><a name="line.538"></a>
-<span class="sourceLineNo">539</span> markReturningState(p);<a name="line.539"></a>
-<span class="sourceLineNo">540</span><a name="line.540"></a>
-<span class="sourceLineNo">541</span> final long activeTime = p.getActiveTimeMillis();<a name="line.541"></a>
-<span class="sourceLineNo">542</span><a name="line.542"></a>
-<span class="sourceLineNo">543</span> if (getTestOnReturn() && !factory.validateObject(p)) {<a name="line.543"></a>
-<span class="sourceLineNo">544</span> try {<a name="line.544"></a>
-<span class="sourceLineNo">545</span> destroy(p);<a name="line.545"></a>
-<span class="sourceLineNo">546</span> } catch (final Exception e) {<a name="line.546"></a>
-<span class="sourceLineNo">547</span> swallowException(e);<a name="line.547"></a>
-<span class="sourceLineNo">548</span> }<a name="line.548"></a>
-<span class="sourceLineNo">549</span> try {<a name="line.549"></a>
-<span class="sourceLineNo">550</span> ensureIdle(1, false);<a name="line.550"></a>
-<span class="sourceLineNo">551</span> } catch (final Exception e) {<a name="line.551"></a>
-<span class="sourceLineNo">552</span> swallowException(e);<a name="line.552"></a>
-<span class="sourceLineNo">553</span> }<a name="line.553"></a>
-<span class="sourceLineNo">554</span> updateStatsReturn(activeTime);<a name="line.554"></a>
-<span class="sourceLineNo">555</span> return;<a name="line.555"></a>
-<span class="sourceLineNo">556</span> }<a name="line.556"></a>
-<span class="sourceLineNo">557</span><a name="line.557"></a>
-<span class="sourceLineNo">558</span> try {<a name="line.558"></a>
-<span class="sourceLineNo">559</span> factory.passivateObject(p);<a name="line.559"></a>
-<span class="sourceLineNo">560</span> } catch (final Exception e1) {<a name="line.560"></a>
-<span class="sourceLineNo">561</span> swallowException(e1);<a name="line.561"></a>
-<span class="sourceLineNo">562</span> try {<a name="line.562"></a>
-<span class="sourceLineNo">563</span> destroy(p);<a name="line.563"></a>
-<span class="sourceLineNo">564</span> } catch (final Exception e) {<a name="line.564"></a>
-<span class="sourceLineNo">565</span> swallowException(e);<a name="line.565"></a>
-<span class="sourceLineNo">566</span> }<a name="line.566"></a>
-<span class="sourceLineNo">567</span> try {<a name="line.567"></a>
-<span class="sourceLineNo">568</span> ensureIdle(1, false);<a name="line.568"></a>
-<span class="sourceLineNo">569</span> } catch (final Exception e) {<a name="line.569"></a>
-<span class="sourceLineNo">570</span> swallowException(e);<a name="line.570"></a>
-<span class="sourceLineNo">571</span> }<a name="line.571"></a>
-<span class="sourceLineNo">572</span> updateStatsReturn(activeTime);<a name="line.572"></a>
-<span class="sourceLineNo">573</span> return;<a name="line.573"></a>
-<span class="sourceLineNo">574</span> }<a name="line.574"></a>
-<span class="sourceLineNo">575</span><a name="line.575"></a>
-<span class="sourceLineNo">576</span> if (!p.deallocate()) {<a name="line.576"></a>
-<span class="sourceLineNo">577</span> throw new IllegalStateException(<a name="line.577"></a>
-<span class="sourceLineNo">578</span> "Object has already been returned to this pool or is invalid");<a name="line.578"></a>
-<span class="sourceLineNo">579</span> }<a name="line.579"></a>
-<span class="sourceLineNo">580</span><a name="line.580"></a>
-<span class="sourceLineNo">581</span> final int maxIdleSave = getMaxIdle();<a name="line.581"></a>
-<span class="sourceLineNo">582</span> if (isClosed() || maxIdleSave > -1 && maxIdleSave <= idleObjects.size()) {<a name="line.582"></a>
-<span class="sourceLineNo">583</span> try {<a name="line.583"></a>
-<span class="sourceLineNo">584</span> destroy(p);<a name="line.584"></a>
-<span class="sourceLineNo">585</span> } catch (final Exception e) {<a name="line.585"></a>
-<span class="sourceLineNo">586</span> swallowException(e);<a name="line.586"></a>
-<span class="sourceLineNo">587</span> }<a name="line.587"></a>
-<span class="sourceLineNo">588</span> } else {<a name="line.588"></a>
-<span class="sourceLineNo">589</span> if (getLifo()) {<a name="line.589"></a>
-<span class="sourceLineNo">590</span> idleObjects.addFirst(p);<a name="line.590"></a>
-<span class="sourceLineNo">591</span> } else {<a name="line.591"></a>
-<span class="sourceLineNo">592</span> idleObjects.addLast(p);<a name="line.592"></a>
-<span class="sourceLineNo">593</span> }<a name="line.593"></a>
-<span class="sourceLineNo">594</span> if (isClosed()) {<a name="line.594"></a>
-<span class="sourceLineNo">595</span> // Pool closed while object was being added to idle objects.<a name="line.595"></a>
-<span class="sourceLineNo">596</span> // Make sure the returned object is destroyed rather than left<a name="line.596"></a>
-<span class="sourceLineNo">597</span> // in the idle object pool (which would effectively be a leak)<a name="line.597"></a>
-<span class="sourceLineNo">598</span> clear();<a name="line.598"></a>
-<span class="sourceLineNo">599</span> }<a name="line.599"></a>
-<span class="sourceLineNo">600</span> }<a name="line.600"></a>
-<span class="sourceLineNo">601</span> updateStatsReturn(activeTime);<a name="line.601"></a>
-<span class="sourceLineNo">602</span> }<a name="line.602"></a>
-<span class="sourceLineNo">603</span><a name="line.603"></a>
-<span class="sourceLineNo">604</span> /**<a name="line.604"></a>
-<span class="sourceLineNo">605</span> * {@inheritDoc}<a name="line.605"></a>
-<span class="sourceLineNo">606</span> * <p><a name="line.606"></a>
-<span class="sourceLineNo">607</span> * Activation of this method decrements the active count and attempts to<a name="line.607"></a>
-<span class="sourceLineNo">608</span> * destroy the instance.<a name="line.608"></a>
-<span class="sourceLineNo">609</span> *<a name="line.609"></a>
-<span class="sourceLineNo">610</span> * @throws Exception if an exception occurs destroying the<a name="line.610"></a>
-<span class="sourceLineNo">611</span> * object<a name="line.611"></a>
-<span class="sourceLineNo">612</span> * @throws IllegalStateException if obj does not belong to this pool<a name="line.612"></a>
-<span class="sourceLineNo">613</span> */<a name="line.613"></a>
-<span class="sourceLineNo">614</span> @Override<a name="line.614"></a>
-<span class="sourceLineNo">615</span> public void invalidateObject(final T obj) throws Exception {<a name="line.615"></a>
-<span class="sourceLineNo">616</span> final PooledObject<T> p = allObjects.get(new IdentityWrapper<>(obj));<a name="line.616"></a>
-<span class="sourceLineNo">617</span> if (p == null) {<a name="line.617"></a>
-<span class="sourceLineNo">618</span> if (isAbandonedConfig()) {<a name="line.618"></a>
-<span class="sourceLineNo">619</span> return;<a name="line.619"></a>
-<span class="sourceLineNo">620</span> }<a name="line.620"></a>
-<span class="sourceLineNo">621</span> throw new IllegalStateException(<a name="line.621"></a>
-<span class="sourceLineNo">622</span> "Invalidated object not currently part of this pool");<a name="line.622"></a>
-<span class="sourceLineNo">623</span> }<a name="line.623"></a>
-<span class="sourceLineNo">624</span> synchronized (p) {<a name="line.624"></a>
-<span class="sourceLineNo">625</span> if (p.getState() != PooledObjectState.INVALID) {<a name="line.625"></a>
-<span class="sourceLineNo">626</span> destroy(p);<a name="line.626"></a>
-<span class="sourceLineNo">627</span> }<a name="line.627"></a>
-<span class="sourceLineNo">628</span> }<a name="line.628"></a>
-<span class="sourceLineNo">629</span> ensureIdle(1, false);<a name="line.629"></a>
-<span class="sourceLineNo">630</span> }<a name="line.630"></a>
-<span class="sourceLineNo">631</span><a name="line.631"></a>
-<span class="sourceLineNo">632</span> /**<a name="line.632"></a>
-<span class="sourceLineNo">633</span> * Clears any objects sitting idle in the pool by removing them from the<a name="line.633"></a>
-<span class="sourceLineNo">634</span> * idle instance pool and then invoking the configured<a name="line.634"></a>
-<span class="sourceLineNo">635</span> * {@link PooledObjectFactory#destroyObject(PooledObject)} method on each<a name="line.635"></a>
-<span class="sourceLineNo">636</span> * idle instance.<a name="line.636"></a>
-<span class="sourceLineNo">637</span> * <p><a name="line.637"></a>
-<span class="sourceLineNo">638</span> * Implementation notes:<a name="line.638"></a>
-<span class="sourceLineNo">639</span> * <ul><a name="line.639"></a>
-<span class="sourceLineNo">640</span> * <li>This method does not destroy or effect in any way instances that are<a name="line.640"></a>
-<span class="sourceLineNo">641</span> * checked out of the pool when it is invoked.</li><a name="line.641"></a>
-<span class="sourceLineNo">642</span> * <li>Invoking this method does not prevent objects being returned to the<a name="line.642"></a>
-<span class="sourceLineNo">643</span> * idle instance pool, even during its execution. Additional instances may<a name="line.643"></a>
-<span class="sourceLineNo">644</span> * be returned while removed items are being destroyed.</li><a name="line.644"></a>
-<span class="sourceLineNo">645</span> * <li>Exceptions encountered destroying idle instances are swallowed<a name="line.645"></a>
-<span class="sourceLineNo">646</span> * but notified via a {@link SwallowedExceptionListener}.</li><a name="line.646"></a>
-<span class="sourceLineNo">647</span> * </ul><a name="line.647"></a>
-<span class="sourceLineNo">648</span> */<a name="line.648"></a>
+<span class="sourceLineNo">539</span> try {<a name="line.539"></a>
+<span class="sourceLineNo">540</span> factory.passivateObject(p);<a name="line.540"></a>
+<span class="sourceLineNo">541</span> } catch (final Exception e1) {<a name="line.541"></a>
+<span class="sourceLineNo">542</span> swallowException(e1);<a name="line.542"></a>
+<span class="sourceLineNo">543</span> try {<a name="line.543"></a>
+<span class="sourceLineNo">544</span> destroy(p);<a name="line.544"></a>
+<span class="sourceLineNo">545</span> } catch (final Exception e) {<a name="line.545"></a>
+<span class="sourceLineNo">546</span> swallowException(e);<a name="line.546"></a>
+<span class="sourceLineNo">547</span> }<a name="line.547"></a>
+<span class="sourceLineNo">548</span> try {<a name="line.548"></a>
+<span class="sourceLineNo">549</span> ensureIdle(1, false);<a name="line.549"></a>
+<span class="sourceLineNo">550</span> } catch (final Exception e) {<a name="line.550"></a>
+<span class="sourceLineNo">551</span> swallowException(e);<a name="line.551"></a>
+<span class="sourceLineNo">552</span> }<a name="line.552"></a>
+<span class="sourceLineNo">553</span> updateStatsReturn(activeTime);<a name="line.553"></a>
+<span class="sourceLineNo">554</span> return;<a name="line.554"></a>
+<span class="sourceLineNo">555</span> }<a name="line.555"></a>
+<span class="sourceLineNo">556</span><a name="line.556"></a>
+<span class="sourceLineNo">557</span> if (!p.deallocate()) {<a name="line.557"></a>
+<span class="sourceLineNo">558</span> throw new IllegalStateException(<a name="line.558"></a>
+<span class="sourceLineNo">559</span> "Object has already been returned to this pool or is invalid");<a name="line.559"></a>
+<span class="sourceLineNo">560</span> }<a name="line.560"></a>
+<span class="sourceLineNo">561</span><a name="line.561"></a>
+<span class="sourceLineNo">562</span> final int maxIdleSave = getMaxIdle();<a name="line.562"></a>
+<span class="sourceLineNo">563</span> if (isClosed() || maxIdleSave > -1 && maxIdleSave <= idleObjects.size()) {<a name="line.563"></a>
+<span class="sourceLineNo">564</span> try {<a name="line.564"></a>
+<span class="sourceLineNo">565</span> destroy(p);<a name="line.565"></a>
+<span class="sourceLineNo">566</span> } catch (final Exception e) {<a name="line.566"></a>
+<span class="sourceLineNo">567</span> swallowException(e);<a name="line.567"></a>
+<span class="sourceLineNo">568</span> }<a name="line.568"></a>
+<span class="sourceLineNo">569</span> } else {<a name="line.569"></a>
+<span class="sourceLineNo">570</span> if (getLifo()) {<a name="line.570"></a>
+<span class="sourceLineNo">571</span> idleObjects.addFirst(p);<a name="line.571"></a>
+<span class="sourceLineNo">572</span> } else {<a name="line.572"></a>
+<span class="sourceLineNo">573</span> idleObjects.addLast(p);<a name="line.573"></a>
+<span class="sourceLineNo">574</span> }<a name="line.574"></a>
+<span class="sourceLineNo">575</span> if (isClosed()) {<a name="line.575"></a>
+<span class="sourceLineNo">576</span> // Pool closed while object was being added to idle objects.<a name="line.576"></a>
+<span class="sourceLineNo">577</span> // Make sure the returned object is destroyed rather than left<a name="line.577"></a>
+<span class="sourceLineNo">578</span> // in the idle object pool (which would effectively be a leak)<a name="line.578"></a>
+<span class="sourceLineNo">579</span> clear();<a name="line.579"></a>
+<span class="sourceLineNo">580</span> }<a name="line.580"></a>
+<span class="sourceLineNo">581</span> }<a name="line.581"></a>
+<span class="sourceLineNo">582</span> updateStatsReturn(activeTime);<a name="line.582"></a>
+<span class="sourceLineNo">583</span> }<a name="line.583"></a>
+<span class="sourceLineNo">584</span><a name="line.584"></a>
+<span class="sourceLineNo">585</span> /**<a name="line.585"></a>
+<span class="sourceLineNo">586</span> * {@inheritDoc}<a name="line.586"></a>
+<span class="sourceLineNo">587</span> * <p><a name="line.587"></a>
+<span class="sourceLineNo">588</span> * Activation of this method decrements the active count and attempts to<a name="line.588"></a>
+<span class="sourceLineNo">589</span> * destroy the instance.<a name="line.589"></a>
+<span class="sourceLineNo">590</span> *<a name="line.590"></a>
+<span class="sourceLineNo">591</span> * @throws Exception if an exception occurs destroying the<a name="line.591"></a>
+<span class="sourceLineNo">592</span> * object<a name="line.592"></a>
+<span class="sourceLineNo">593</span> * @throws IllegalStateException if obj does not belong to this pool<a name="line.593"></a>
+<span class="sourceLineNo">594</span> */<a name="line.594"></a>
+<span class="sourceLineNo">595</span> @Override<a name="line.595"></a>
+<span class="sourceLineNo">596</span> public void invalidateObject(final T obj) throws Exception {<a name="line.596"></a>
+<span class="sourceLineNo">597</span> final PooledObject<T> p = allObjects.get(new IdentityWrapper<>(obj));<a name="line.597"></a>
+<span class="sourceLineNo">598</span> if (p == null) {<a name="line.598"></a>
+<span class="sourceLineNo">599</span> if (isAbandonedConfig()) {<a name="line.599"></a>
+<span class="sourceLineNo">600</span> return;<a name="line.600"></a>
+<span class="sourceLineNo">601</span> }<a name="line.601"></a>
+<span class="sourceLineNo">602</span> throw new IllegalStateException(<a name="line.602"></a>
+<span class="sourceLineNo">603</span> "Invalidated object not currently part of this pool");<a name="line.603"></a>
+<span class="sourceLineNo">604</span> }<a name="line.604"></a>
+<span class="sourceLineNo">605</span> synchronized (p) {<a name="line.605"></a>
+<span class="sourceLineNo">606</span> if (p.getState() != PooledObjectState.INVALID) {<a name="line.606"></a>
+<span class="sourceLineNo">607</span> destroy(p);<a name="line.607"></a>
+<span class="sourceLineNo">608</span> }<a name="line.608"></a>
+<span class="sourceLineNo">609</span> }<a name="line.609"></a>
+<span class="sourceLineNo">610</span> ensureIdle(1, false);<a name="line.610"></a>
+<span class="sourceLineNo">611</span> }<a name="line.611"></a>
+<span class="sourceLineNo">612</span><a name="line.612"></a>
+<span class="sourceLineNo">613</span> /**<a name="line.613"></a>
+<span class="sourceLineNo">614</span> * Clears any objects sitting idle in the pool by removing them from the<a name="line.614"></a>
+<span class="sourceLineNo">615</span> * idle instance pool and then invoking the configured<a name="line.615"></a>
+<span class="sourceLineNo">616</span> * {@link PooledObjectFactory#destroyObject(PooledObject)} method on each<a name="line.616"></a>
+<span class="sourceLineNo">617</span> * idle instance.<a name="line.617"></a>
+<span class="sourceLineNo">618</span> * <p><a name="line.618"></a>
+<span class="sourceLineNo">619</span> * Implementation notes:<a name="line.619"></a>
+<span class="sourceLineNo">620</span> * <ul><a name="line.620"></a>
+<span class="sourceLineNo">621</span> * <li>This method does not destroy or effect in any way instances that are<a name="line.621"></a>
+<span class="sourceLineNo">622</span> * checked out of the pool when it is invoked.</li><a name="line.622"></a>
+<span class="sourceLineNo">623</span> * <li>Invoking this method does not prevent objects being returned to the<a name="line.623"></a>
+<span class="sourceLineNo">624</span> * idle instance pool, even during its execution. Additional instances may<a name="line.624"></a>
+<span class="sourceLineNo">625</span> * be returned while removed items are being destroyed.</li><a name="line.625"></a>
+<span class="sourceLineNo">626</span> * <li>Exceptions encountered destroying idle instances are swallowed<a name="line.626"></a>
+<span class="sourceLineNo">627</span> * but notified via a {@link SwallowedExceptionListener}.</li><a name="line.627"></a>
+<span class="sourceLineNo">628</span> * </ul><a name="line.628"></a>
+<span class="sourceLineNo">629</span> */<a name="line.629"></a>
+<span class="sourceLineNo">630</span> @Override<a name="line.630"></a>
+<span class="sourceLineNo">631</span> public void clear() {<a name="line.631"></a>
+<span class="sourceLineNo">632</span> PooledObject<T> p = idleObjects.poll();<a name="line.632"></a>
+<span class="sourceLineNo">633</span><a name="line.633"></a>
+<span class="sourceLineNo">634</span> while (p != null) {<a name="line.634"></a>
+<span class="sourceLineNo">635</span> try {<a name="line.635"></a>
+<span class="sourceLineNo">636</span> destroy(p);<a name="line.636"></a>
+<span class="sourceLineNo">637</span> } catch (final Exception e) {<a name="line.637"></a>
+<span class="sourceLineNo">638</span> swallowException(e);<a name="line.638"></a>
+<span class="sourceLineNo">639</span> }<a name="line.639"></a>
+<span class="sourceLineNo">640</span> p = idleObjects.poll();<a name="line.640"></a>
+<span class="sourceLineNo">641</span> }<a name="line.641"></a>
+<span class="sourceLineNo">642</span> }<a name="line.642"></a>
+<span class="sourceLineNo">643</span><a name="line.643"></a>
+<span class="sourceLineNo">644</span> @Override<a name="line.644"></a>
+<span class="sourceLineNo">645</span> public int getNumActive() {<a name="line.645"></a>
+<span class="sourceLineNo">646</span> return allObjects.size() - idleObjects.size();<a name="line.646"></a>
+<span class="sourceLineNo">647</span> }<a name="line.647"></a>
+<span class="sourceLineNo">648</span><a name="line.648"></a>
<span class="sourceLineNo">649</span> @Override<a name="line.649"></a>
-<span class="sourceLineNo">650</span> public void clear() {<a name="line.650"></a>
-<span class="sourceLineNo">651</span> PooledObject<T> p = idleObjects.poll();<a name="line.651"></a>
-<span class="sourceLineNo">652</span><a name="line.652"></a>
-<span class="sourceLineNo">653</span> while (p != null) {<a name="line.653"></a>
-<span class="sourceLineNo">654</span> try {<a name="line.654"></a>
-<span class="sourceLineNo">655</span> destroy(p);<a name="line.655"></a>
-<span class="sourceLineNo">656</span> } catch (final Exception e) {<a name="line.656"></a>
-<span class="sourceLineNo">657</span> swallowException(e);<a name="line.657"></a>
-<span class="sourceLineNo">658</span> }<a name="line.658"></a>
-<span class="sourceLineNo">659</span> p = idleObjects.poll();<a name="line.659"></a>
-<span class="sourceLineNo">660</span> }<a name="line.660"></a>
-<span class="sourceLineNo">661</span> }<a name="line.661"></a>
-<span class="sourceLineNo">662</span><a name="line.662"></a>
-<span class="sourceLineNo">663</span> @Override<a name="line.663"></a>
-<span class="sourceLineNo">664</span> public int getNumActive() {<a name="line.664"></a>
-<span class="sourceLineNo">665</span> return allObjects.size() - idleObjects.size();<a name="line.665"></a>
-<span class="sourceLineNo">666</span> }<a name="line.666"></a>
+<span class="sourceLineNo">650</span> public int getNumIdle() {<a name="line.650"></a>
+<span class="sourceLineNo">651</span> return idleObjects.size();<a name="line.651"></a>
+<span class="sourceLineNo">652</span> }<a name="line.652"></a>
+<span class="sourceLineNo">653</span><a name="line.653"></a>
+<span class="sourceLineNo">654</span> /**<a name="line.654"></a>
+<span class="sourceLineNo">655</span> * Closes the pool. Once the pool is closed, {@link #borrowObject()} will<a name="line.655"></a>
+<span class="sourceLineNo">656</span> * fail with IllegalStateException, but {@link #returnObject(Object)} and<a name="line.656"></a>
+<span class="sourceLineNo">657</span> * {@link #invalidateObject(Object)} will continue to work, with returned<a name="line.657"></a>
+<span class="sourceLineNo">658</span> * objects destroyed on return.<a name="line.658"></a>
+<span class="sourceLineNo">659</span> * <p><a name="line.659"></a>
+<span class="sourceLineNo">660</span> * Destroys idle instances in the pool by invoking {@link #clear()}.<a name="line.660"></a>
+<span class="sourceLineNo">661</span> */<a name="line.661"></a>
+<span class="sourceLineNo">662</span> @Override<a name="line.662"></a>
+<span class="sourceLineNo">663</span> public void close() {<a name="line.663"></a>
+<span class="sourceLineNo">664</span> if (isClosed()) {<a name="line.664"></a>
+<span class="sourceLineNo">665</span> return;<a name="line.665"></a>
+<span class="sourceLineNo">666</span> }<a name="line.666"></a>
<span class="sourceLineNo">667</span><a name="line.667"></a>
-<span class="sourceLineNo">668</span> @Override<a name="line.668"></a>
-<span class="sourceLineNo">669</span> public int getNumIdle() {<a name="line.669"></a>
-<span class="sourceLineNo">670</span> return idleObjects.size();<a name="line.670"></a>
-<span class="sourceLineNo">671</span> }<a name="line.671"></a>
+<span class="sourceLineNo">668</span> synchronized (closeLock) {<a name="line.668"></a>
+<span class="sourceLineNo">669</span> if (isClosed()) {<a name="line.669"></a>
+<span class="sourceLineNo">670</span> return;<a name="line.670"></a>
+<span class="sourceLineNo">671</span> }<a name="line.671"></a>
<span class="sourceLineNo">672</span><a name="line.672"></a>
-<span class="sourceLineNo">673</span> /**<a name="line.673"></a>
-<span class="sourceLineNo">674</span> * Closes the pool. Once the pool is closed, {@link #borrowObject()} will<a name="line.674"></a>
-<span class="sourceLineNo">675</span> * fail with IllegalStateException, but {@link #returnObject(Object)} and<a name="line.675"></a>
-<span class="sourceLineNo">676</span> * {@link #invalidateObject(Object)} will continue to work, with returned<a name="line.676"></a>
-<span class="sourceLineNo">677</span> * objects destroyed on return.<a name="line.677"></a>
-<span class="sourceLineNo">678</span> * <p><a name="line.678"></a>
-<span class="sourceLineNo">679</span> * Destroys idle instances in the pool by invoking {@link #clear()}.<a name="line.679"></a>
-<span class="sourceLineNo">680</span> */<a name="line.680"></a>
-<span class="sourceLineNo">681</span> @Override<a name="line.681"></a>
-<span class="sourceLineNo">682</span> public void close() {<a name="line.682"></a>
-<span class="sourceLineNo">683</span> if (isClosed()) {<a name="line.683"></a>
-<span class="sourceLineNo">684</span> return;<a name="line.684"></a>
+<span class="sourceLineNo">673</span> // Stop the evictor before the pool is closed since evict() calls<a name="line.673"></a>
+<span class="sourceLineNo">674</span> // assertOpen()<a name="line.674"></a>
+<span class="sourceLineNo">675</span> stopEvitor();<a name="line.675"></a>
+<span class="sourceLineNo">676</span><a name="line.676"></a>
+<span class="sourceLineNo">677</span> closed = true;<a name="line.677"></a>
+<span class="sourceLineNo">678</span> // This clear removes any idle objects<a name="line.678"></a>
+<span class="sourceLineNo">679</span> clear();<a name="line.679"></a>
+<span class="sourceLineNo">680</span><a name="line.680"></a>
+<span class="sourceLineNo">681</span> jmxUnregister();<a name="line.681"></a>
+<span class="sourceLineNo">682</span><a name="line.682"></a>
+<span class="sourceLineNo">683</span> // Release any threads that were waiting for an object<a name="line.683"></a>
+<span class="sourceLineNo">684</span> idleObjects.interuptTakeWaiters();<a name="line.684"></a>
<span class="sourceLineNo">685</span> }<a name="line.685"></a>
-<span class="sourceLineNo">686</span><a name="line.686"></a>
-<span class="sourceLineNo">687</span> synchronized (closeLock) {<a name="line.687"></a>
-<span class="sourceLineNo">688</span> if (isClosed()) {<a name="line.688"></a>
-<span class="sourceLineNo">689</span> return;<a name="line.689"></a>
-<span class="sourceLineNo">690</span> }<a name="line.690"></a>
-<span class="sourceLineNo">691</span><a name="line.691"></a>
-<span class="sourceLineNo">692</span> // Stop the evictor before the pool is closed since evict() calls<a name="line.692"></a>
-<span class="sourceLineNo">693</span> // assertOpen()<a name="line.693"></a>
-<span class="sourceLineNo">694</span> startEvictor(-1L);<a name="line.694"></a>
-<span class="sourceLineNo">695</span><a name="line.695"></a>
-<span class="sourceLineNo">696</span> closed = true;<a name="line.696"></a>
-<span class="sourceLineNo">697</span> // This clear removes any idle objects<a name="line.697"></a>
-<span class="sourceLineNo">698</span> clear();<a name="line.698"></a>
+<span class="sourceLineNo">686</span> }<a name="line.686"></a>
+<span class="sourceLineNo">687</span><a name="line.687"></a>
+<span class="sourceLineNo">688</span> /**<a name="line.688"></a>
+<span class="sourceLineNo">689</span> * {@inheritDoc}<a name="line.689"></a>
+<span class="sourceLineNo">690</span> * <p><a name="line.690"></a>
+<span class="sourceLineNo">691</span> * Successive activations of this method examine objects in sequence,<a name="line.691"></a>
+<span class="sourceLineNo">692</span> * cycling through objects in oldest-to-youngest order.<a name="line.692"></a>
+<span class="sourceLineNo">693</span> */<a name="line.693"></a>
+<span class="sourceLineNo">694</span> @Override<a name="line.694"></a>
+<span class="sourceLineNo">695</span> public void evict() throws Exception {<a name="line.695"></a>
+<span class="sourceLineNo">696</span> assertOpen();<a name="line.696"></a>
+<span class="sourceLineNo">697</span><a name="line.697"></a>
+<span class="sourceLineNo">698</span> if (idleObjects.size() > 0) {<a name="line.698"></a>
<span class="sourceLineNo">699</span><a name="line.699"></a>
-<span class="sourceLineNo">700</span> jmxUnregister();<a name="line.700"></a>
-<span class="sourceLineNo">701</span><a name="line.701"></a>
-<span class="sourceLineNo">702</span> // Release any threads that were waiting for an object<a name="line.702"></a>
-<span class="sourceLineNo">703</span> idleObjects.interuptTakeWaiters();<a name="line.703"></a>
-<span class="sourceLineNo">704</span> }<a name="line.704"></a>
-<span class="sourceLineNo">705</span> }<a name="line.705"></a>
-<span class="sourceLineNo">706</span><a name="line.706"></a>
-<span class="sourceLineNo">707</span> /**<a name="line.707"></a>
-<span class="sourceLineNo">708</span> * {@inheritDoc}<a name="line.708"></a>
-<span class="sourceLineNo">709</span> * <p><a name="line.709"></a>
-<span class="sourceLineNo">710</span> * Successive activations of this method examine objects in sequence,<a name="line.710"></a>
-<span class="sourceLineNo">711</span> * cycling through objects in oldest-to-youngest order.<a name="line.711"></a>
-<span class="sourceLineNo">712</span> */<a name="line.712"></a>
-<span class="sourceLineNo">713</span> @Override<a name="line.713"></a>
-<span class="sourceLineNo">714</span> public void evict() throws Exception {<a name="line.714"></a>
-<span class="sourceLineNo">715</span> assertOpen();<a name="line.715"></a>
-<span class="sourceLineNo">716</span><a name="line.716"></a>
-<span class="sourceLineNo">717</span> if (idleObjects.size() > 0) {<a name="line.717"></a>
-<span class="sourceLineNo">718</span><a name="line.718"></a>
-<span class="sourceLineNo">719</span> PooledObject<T> underTest = null;<a name="line.719"></a>
-<span class="sourceLineNo">720</span> final EvictionPolicy<T> evictionPolicy = getEvictionPolicy();<a name="line.720"></a>
-<span class="sourceLineNo">721</span><a name="line.721"></a>
-<span class="sourceLineNo">722</span> synchronized (evictionLock) {<a name="line.722"></a>
-<span class="sourceLineNo">723</span> final EvictionConfig evictionConfig = new EvictionConfig(<a name="line.723"></a>
-<span class="sourceLineNo">724</span> getMinEvictableIdleTimeMillis(),<a name="line.724"></a>
-<span class="sourceLineNo">725</span> getSoftMinEvictableIdleTimeMillis(),<a name="line.725"></a>
-<span class="sourceLineNo">726</span> getMinIdle());<a name="line.726"></a>
-<span class="sourceLineNo">727</span><a name="line.727"></a>
-<span class="sourceLineNo">728</span> final boolean testWhileIdle = getTestWhileIdle();<a name="line.728"></a>
+<span class="sourceLineNo">700</span> PooledObject<T> underTest = null;<a name="line.700"></a>
+<span class="sourceLineNo">701</span> final EvictionPolicy<T> evictionPolicy = getEvictionPolicy();<a name="line.701"></a>
+<span class="sourceLineNo">702</span><a name="line.702"></a>
+<span class="sourceLineNo">703</span> synchronized (evictionLock) {<a name="line.703"></a>
+<span class="sourceLineNo">704</span> final EvictionConfig evictionConfig = new EvictionConfig(<a name="line.704"></a>
+<span class="sourceLineNo">705</span> getMinEvictableIdleTimeMillis(),<a name="line.705"></a>
+<span class="sourceLineNo">706</span> getSoftMinEvictableIdleTimeMillis(),<a name="line.706"></a>
+<span class="sourceLineNo">707</span> getMinIdle());<a name="line.707"></a>
+<span class="sourceLineNo">708</span><a name="line.708"></a>
+<span class="sourceLineNo">709</span> final boolean testWhileIdle = getTestWhileIdle();<a name="line.709"></a>
+<span class="sourceLineNo">710</span><a name="line.710"></a>
+<span class="sourceLineNo">711</span> for (int i = 0, m = getNumTests(); i < m; i++) {<a name="line.711"></a>
+<span class="sourceLineNo">712</span> if (evictionIterator == null || !evictionIterator.hasNext()) {<a name="line.712"></a>
+<span class="sourceLineNo">713</span> evictionIterator = new EvictionIterator(idleObjects);<a name="line.713"></a>
+<span class="sourceLineNo">714</span> }<a name="line.714"></a>
+<span class="sourceLineNo">715</span> if (!evictionIterator.hasNext()) {<a name="line.715"></a>
+<span class="sourceLineNo">716</span> // Pool exhausted, nothing to do here<a name="line.716"></a>
+<span class="sourceLineNo">717</span> return;<a name="line.717"></a>
+<span class="sourceLineNo">718</span> }<a name="line.718"></a>
+<span class="sourceLineNo">719</span><a name="line.719"></a>
+<span class="sourceLineNo">720</span> try {<a name="line.720"></a>
+<span class="sourceLineNo">721</span> underTest = evictionIterator.next();<a name="line.721"></a>
+<span class="sourceLineNo">722</span> } catch (final NoSuchElementException nsee) {<a name="line.722"></a>
+<span class="sourceLineNo">723</span> // Object was borrowed in another thread<a name="line.723"></a>
+<span class="sourceLineNo">724</span> // Don't count this as an eviction test so reduce i;<a name="line.724"></a>
+<span class="sourceLineNo">725</span> i--;<a name="line.725"></a>
+<span class="sourceLineNo">726</span> evictionIterator = null;<a name="line.726"></a>
+<span class="sourceLineNo">727</span> continue;<a name="line.727"></a>
+<span class="sourceLineNo">728</span> }<a name="line.728"></a>
<span class="sourceLineNo">729</span><a name="line.729"></a>
-<span class="sourceLineNo">730</span> for (int i = 0, m = getNumTests(); i < m; i++) {<a name="line.730"></a>
-<span class="sourceLineNo">731</span> if (evictionIterator == null || !evictionIterator.hasNext()) {<a name="line.731"></a>
-<span class="sourceLineNo">732</span> evictionIterator = new EvictionIterator(idleObjects);<a name="line.732"></a>
-<span class="sourceLineNo">733</span> }<a name="line.733"></a>
-<span class="sourceLineNo">734</span> if (!evictionIterator.hasNext()) {<a name="line.734"></a>
-<span class="sourceLineNo">735</span> // Pool exhausted, nothing to do here<a name="line.735"></a>
-<span class="sourceLineNo">736</span> return;<a name="line.736"></a>
-<span class="sourceLineNo">737</span> }<a name="line.737"></a>
-<span class="sourceLineNo">738</span><a name="line.738"></a>
-<span class="sourceLineNo">739</span> try {<a name="line.739"></a>
-<span class="sourceLineNo">740</span> underTest = evictionIterator.next();<a name="line.740"></a>
-<span class="sourceLineNo">741</span> } catch (final NoSuchElementException nsee) {<a name="line.741"></a>
-<span class="sourceLineNo">742</span> // Object was borrowed in another thread<a name="line.742"></a>
-<span class="sourceLineNo">743</span> // Don't count this as an eviction test so reduce i;<a name="line.743"></a>
-<span class="sourceLineNo">744</span> i--;<a name="line.744"></a>
-<span class="sourceLineNo">745</span> evictionIterator = null;<a name="line.745"></a>
-<span class="sourceLineNo">746</span> continue;<a name="line.746"></a>
-<span class="sourceLineNo">747</span> }<a name="line.747"></a>
-<span class="sourceLineNo">748</span><a name="line.748"></a>
-<span class="sourceLineNo">749</span> if (!underTest.startEvictionTest()) {<a name="line.749"></a>
-<span class="sourceLineNo">750</span> // Object was borrowed in another thread<a name="line.750"></a>
-<span class="sourceLineNo">751</span> // Don't count this as an eviction test so reduce i;<a name="line.751"></a>
-<span class="sourceLineNo">752</span> i--;<a name="line.752"></a>
-<span class="sourceLineNo">753</span> continue;<a name="line.753"></a>
-<span class="sourceLineNo">754</span> }<a name="line.754"></a>
-<span class="sourceLineNo">755</span><a name="line.755"></a>
-<span class="sourceLineNo">756</span> // User provided eviction policy could throw all sorts of<a name="line.756"></a>
-<span class="sourceLineNo">757</span> // crazy exceptions. Protect against such an exception<a name="line.757"></a>
-<span class="sourceLineNo">758</span> // killing the eviction thread.<a name="line.758"></a>
-<span class="sourceLineNo">759</span> boolean evict;<a name="line.759"></a>
-<span class="sourceLineNo">760</span> try {<a name="line.760"></a>
-<span class="sourceLineNo">761</span> evict = evictionPolicy.evict(evictionConfig, underTest,<a name="line.761"></a>
-<span class="sourceLineNo">762</span> idleObjects.size());<a name="line.762"></a>
-<span class="sourceLineNo">763</span> } catch (final Throwable t) {<a name="line.763"></a>
-<span class="sourceLineNo">764</span> // Slightly convoluted as SwallowedExceptionListener<a name="line.764"></a>
-<span class="sourceLineNo">765</span> // uses Exception rather than Throwable<a name="line.765"></a>
-<span class="sourceLineNo">766</span> PoolUtils.checkRethrow(t);<a name="line.766"></a>
-<span class="sourceLineNo">767</span> swallowException(new Exception(t));<a name="line.767"></a>
-<span class="sourceLineNo">768</span> // Don't evict on error conditions<a name="line.768"></a>
-<span class="sourceLineNo">769</span> evict = false;<a name="line.769"></a>
-<span class="sourceLineNo">770</span> }<a name="line.770"></a>
-<span class="sourceLineNo">771</span><a name="line.771"></a>
-<span class="sourceLineNo">772</span> if (evict) {<a name="line.772"></a>
-<span class="sourceLineNo">773</span> destroy(underTest);<a name="line.773"></a>
-<span class="sourceLineNo">774</span> destroyedByEvictorCount.incrementAndGet();<a name="line.774"></a>
-<span class="sourceLineNo">775</span> } else {<a name="line.775"></a>
-<span class="sourceLineNo">776</span> if (testWhileIdle) {<a name="line.776"></a>
-<span class="sourceLineNo">777</span> boolean active = false;<a name="line.777"></a>
-<span class="sourceLineNo">778</span> try {<a name="line.778"></a>
[... 873 lines stripped ...]