Author: markt
Date: Mon Mar 3 12:53:57 2014
New Revision: 1573549
URL: http://svn.apache.org/r1573549
Log:
Another small improvement
Modified:
commons/proper/dbcp/trunk/src/changes/changes.xml
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
Modified: commons/proper/dbcp/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/changes/changes.xml?rev=1573549&r1=1573548&r2=1573549&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/changes/changes.xml (original)
+++ commons/proper/dbcp/trunk/src/changes/changes.xml Mon Mar 3 12:53:57 2014
@@ -62,7 +62,7 @@ The <action> type attribute can be add,u
<body>
<release version="2.0.1" date="TBD" description="This is a bug fix
release">
<action dev="markt" type="fix">
- Small performance improvement when returning connections to the pool.
+ Small performance improvements when returning connections to the pool.
</action>
</release>
<release version="2.0" date="3 March 2014" description=
Modified:
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java?rev=1573549&r1=1573548&r2=1573549&view=diff
==============================================================================
---
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
(original)
+++
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
Mon Mar 3 12:53:57 2014
@@ -18,6 +18,7 @@ package org.apache.commons.dbcp2;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -125,7 +126,11 @@ public class AbandonedTrace implements T
* @return List of objects
*/
protected List<AbandonedTrace> getTrace() {
- ArrayList<AbandonedTrace> result = new ArrayList<>(traceList.size());
+ int size = traceList.size();
+ if (size == 0) {
+ return Collections.emptyList();
+ }
+ ArrayList<AbandonedTrace> result = new ArrayList<>(size);
synchronized (this.traceList) {
Iterator<WeakReference<AbandonedTrace>> iter =
traceList.iterator();
while (iter.hasNext()) {
