Author: fschumacher
Date: Thu Aug 16 11:01:13 2018
New Revision: 1838188
URL: http://svn.apache.org/viewvc?rev=1838188&view=rev
Log:
Use isEmpty instead of size on collections to test for emptiness
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1838188&r1=1838187&r2=1838188&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Thu Aug 16 11:01:13 2018
@@ -387,8 +387,8 @@ public class ConnectionPool {
}
/* release all idle connections */
- BlockingQueue<PooledConnection> pool =
(idle.size()>0)?idle:(force?busy:idle);
- while (pool.size()>0) {
+ BlockingQueue<PooledConnection> pool =
(!idle.isEmpty())?idle:(force?busy:idle);
+ while (!pool.isEmpty()) {
try {
//retrieve the next connection
PooledConnection con = pool.poll(1000, TimeUnit.MILLISECONDS);
@@ -399,7 +399,7 @@ public class ConnectionPool {
release(con);
else
abandon(con);
- if (pool.size()>0) {
+ if (!pool.isEmpty()) {
con = pool.poll(1000, TimeUnit.MILLISECONDS);
} else {
break;
@@ -410,7 +410,7 @@ public class ConnectionPool {
Thread.currentThread().interrupt();
}
}
- if (pool.size()==0 && force && pool!=busy) pool = busy;
+ if (pool.isEmpty() && force && pool!=busy) pool = busy;
}
if (this.getPoolProperties().isJmxEnabled()) this.jmxPool = null;
PoolProperties.InterceptorDefinition[] proxies =
getPoolProperties().getJdbcInterceptorsAsArray();
@@ -980,7 +980,7 @@ public class ConnectionPool {
*/
public void checkAbandoned() {
try {
- if (busy.size()==0) return;
+ if (busy.isEmpty()) return;
Iterator<PooledConnection> locked = busy.iterator();
int sto = getPoolProperties().getSuspectTimeout();
while (locked.hasNext()) {
@@ -1027,7 +1027,7 @@ public class ConnectionPool {
public void checkIdle(boolean ignoreMinSize) {
try {
- if (idle.size()==0) return;
+ if (idle.isEmpty()) return;
long now = System.currentTimeMillis();
Iterator<PooledConnection> unlocked = idle.iterator();
while ( (ignoreMinSize ||
(idle.size()>=getPoolProperties().getMinIdle())) && unlocked.hasNext()) {
@@ -1072,7 +1072,7 @@ public class ConnectionPool {
*/
public void testAllIdle() {
try {
- if (idle.size()==0) return;
+ if (idle.isEmpty()) return;
Iterator<PooledConnection> unlocked = idle.iterator();
while (unlocked.hasNext()) {
PooledConnection con = unlocked.next();
@@ -1413,7 +1413,7 @@ public class ConnectionPool {
cleaner.cancel();
if (poolCleanTimer != null) {
poolCleanTimer.purge();
- if (cleaners.size() == 0) {
+ if (cleaners.isEmpty()) {
poolCleanTimer.cancel();
poolCleanTimer = null;
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java?rev=1838188&r1=1838187&r2=1838188&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/FairBlockingQueue.java
Thu Aug 16 11:01:13 2018
@@ -96,7 +96,7 @@ public class FairBlockingQueue<E> implem
ExchangeCountDownLatch<E> c = null;
try {
//check to see if threads are waiting for an object
- if (waiters.size() > 0) {
+ if (!waiters.isEmpty()) {
//if threads are waiting grab the latch for that thread
c = waiters.poll();
//give the object to the thread instead of adding it to the
pool
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java?rev=1838188&r1=1838187&r2=1838188&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/MultiLockFairBlockingQueue.java
Thu Aug 16 11:01:13 2018
@@ -107,7 +107,7 @@ public class MultiLockFairBlockingQueue<
ExchangeCountDownLatch<E> c = null;
try {
//check to see if threads are waiting for an object
- if (waiters[idx].size() > 0) {
+ if (!waiters[idx].isEmpty()) {
//if threads are waiting grab the latch for that thread
c = waiters[idx].poll();
//give the object to the thread instead of adding it to the
pool
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java?rev=1838188&r1=1838187&r2=1838188&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/StatementFinalizer.java
Thu Aug 16 11:01:13 2018
@@ -55,7 +55,7 @@ public class StatementFinalizer extends
@SuppressWarnings("null") // st is not null when used
@Override
public void closeInvoked() {
- while (statements.size()>0) {
+ while (!statements.isEmpty()) {
StatementEntry ws = statements.remove(0);
Statement st = ws.getStatement();
boolean shallClose = false;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
