Author: markt
Date: Fri Oct 26 21:28:07 2012
New Revision: 1402669
URL: http://svn.apache.org/viewvc?rev=1402669&view=rev
Log:
Java 7 <>
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/PooledConnection.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.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=1402669&r1=1402668&r2=1402669&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
Fri Oct 26 21:28:07 2012
@@ -440,16 +440,16 @@ public class ConnectionPool {
}
//make space for 10 extra in case we flow over a bit
- busy = new
ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),false);
+ busy = new ArrayBlockingQueue<>(properties.getMaxActive(),false);
//busy = new FairBlockingQueue<PooledConnection>();
//make space for 10 extra in case we flow over a bit
if (properties.isFairQueue()) {
- idle = new FairBlockingQueue<PooledConnection>();
+ idle = new FairBlockingQueue<>();
//idle = new MultiLockFairBlockingQueue<PooledConnection>();
//idle = new LinkedTransferQueue<PooledConnection>();
//idle = new
ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),false);
} else {
- idle = new
ArrayBlockingQueue<PooledConnection>(properties.getMaxActive(),properties.isFairQueue());
+ idle = new
ArrayBlockingQueue<>(properties.getMaxActive(),properties.isFairQueue());
}
initializePoolCleaner(properties);
@@ -1271,7 +1271,7 @@ public class ConnectionPool {
private static volatile Timer poolCleanTimer = null;
- private static HashSet<PoolCleaner> cleaners = new HashSet<PoolCleaner>();
+ private static HashSet<PoolCleaner> cleaners = new HashSet<>();
private static synchronized void registerCleaner(PoolCleaner cleaner) {
unregisterCleaner(cleaner);
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=1402669&r1=1402668&r2=1402669&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
Fri Oct 26 21:28:07 2012
@@ -77,8 +77,8 @@ public class FairBlockingQueue<E> implem
* Creates a new fair blocking queue.
*/
public FairBlockingQueue() {
- items = new LinkedList<E>();
- waiters = new LinkedList<ExchangeCountDownLatch<E>>();
+ items = new LinkedList<>();
+ waiters = new LinkedList<>();
}
//------------------------------------------------------------------
@@ -142,7 +142,7 @@ public class FairBlockingQueue<E> implem
result = items.poll();
if (result==null && timeout>0) {
//the queue is empty we will wait for an object
- ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<E>(1);
+ ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<>(1);
//add to the bottom of the wait list
waiters.addLast(c);
//unlock the global lock
@@ -184,15 +184,15 @@ public class FairBlockingQueue<E> implem
E item = items.poll();
if (item==null) {
//queue is empty, add ourselves as waiters
- ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<E>(1);
+ ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<>(1);
waiters.addLast(c);
lock.unlock();
//return a future that will wait for the object
- result = new ItemFuture<E>(c);
+ result = new ItemFuture<>(c);
} else {
lock.unlock();
//return a future with the item
- result = new ItemFuture<E>(item);
+ result = new ItemFuture<>(item);
}
error = false;
} finally {
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=1402669&r1=1402668&r2=1402669&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
Fri Oct 26 21:28:07 2012
@@ -84,8 +84,8 @@ public class MultiLockFairBlockingQueue<
items = new LinkedList[LOCK_COUNT];
waiters = new LinkedList[LOCK_COUNT];
for (int i=0; i<LOCK_COUNT; i++) {
- items[i] = new LinkedList<E>();
- waiters[i] = new LinkedList<ExchangeCountDownLatch<E>>();
+ items[i] = new LinkedList<>();
+ waiters[i] = new LinkedList<>();
locks[i] = new ReentrantLock(false);
}
}
@@ -152,7 +152,7 @@ public class MultiLockFairBlockingQueue<
result = items[idx].poll();
if (result==null && timeout>0) {
//the queue is empty we will wait for an object
- ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<E>(1);
+ ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<>(1);
//add to the bottom of the wait list
waiters[idx].addLast(c);
//unlock the global lock
@@ -195,15 +195,15 @@ public class MultiLockFairBlockingQueue<
E item = items[idx].poll();
if (item==null) {
//queue is empty, add ourselves as waiters
- ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<E>(1);
+ ExchangeCountDownLatch<E> c = new ExchangeCountDownLatch<>(1);
waiters[idx].addLast(c);
lock.unlock();
//return a future that will wait for the object
- result = new ItemFuture<E>(c);
+ result = new ItemFuture<>(c);
} else {
lock.unlock();
//return a future with the item
- result = new ItemFuture<E>(item);
+ result = new ItemFuture<>(item);
}
error = false;
} finally {
@@ -521,7 +521,7 @@ public class MultiLockFairBlockingQueue<
E element = null;
public FairIterator() {
- ArrayList<E> list = new
ArrayList<E>(MultiLockFairBlockingQueue.this.size());
+ ArrayList<E> list = new
ArrayList<>(MultiLockFairBlockingQueue.this.size());
for (int idx=0; idx<LOCK_COUNT; idx++) {
final ReentrantLock lock =
MultiLockFairBlockingQueue.this.locks[idx];
lock.lock();
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java?rev=1402669&r1=1402668&r2=1402669&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
Fri Oct 26 21:28:07 2012
@@ -102,7 +102,7 @@ public class PooledConnection {
*/
protected ConnectionPool parent;
- private HashMap<Object, Object> attributes = new HashMap<Object, Object>();
+ private HashMap<Object, Object> attributes = new HashMap<>();
private volatile long connectionVersion=0;
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1402669&r1=1402668&r2=1402669&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
Fri Oct 26 21:28:07 2012
@@ -51,7 +51,8 @@ public class ConnectionPool extends Noti
/**
* Listeners that are local and interested in our notifications, no need
for JMX
*/
- protected ConcurrentLinkedQueue<NotificationListener> listeners = new
ConcurrentLinkedQueue<NotificationListener>();
+ protected ConcurrentLinkedQueue<NotificationListener> listeners =
+ new ConcurrentLinkedQueue<>();
public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool) {
super();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
