This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/7.0.x by this push:
new 9022aa5 Generics: AbandonedTrace
9022aa5 is described below
commit 9022aa50f2c18e560d39dfa58b4397de0cec8962
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 18 14:52:23 2019 +0000
Generics: AbandonedTrace
---
.../apache/tomcat/dbcp/dbcp/AbandonedTrace.java | 24 +++++++++++-----------
.../tomcat/dbcp/dbcp/DelegatingConnection.java | 6 +++---
.../tomcat/dbcp/dbcp/DelegatingStatement.java | 4 ++--
3 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp/AbandonedTrace.java
index ec04cc5..ba8f702 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/AbandonedTrace.java
@@ -5,9 +5,9 @@
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ import java.util.List;
*
* The JDBC Connection, Statement, and ResultSet classes
* extend this class.
- *
+ *
* @author Glenn L. Nielsen
*/
public class AbandonedTrace {
@@ -39,7 +39,7 @@ public class AbandonedTrace {
/** A stack trace of the code that created me (if in debug mode) */
private volatile Exception createdBy;
/** A list of objects created by children of this object */
- private final List traceList = new ArrayList();
+ private final List<AbandonedTrace> traceList = new
ArrayList<AbandonedTrace>();
/** Last time this connection was used */
private volatile long lastUsed = 0;
@@ -78,7 +78,7 @@ public class AbandonedTrace {
* @param parent AbandonedTrace parent object
*/
private void init(AbandonedTrace parent) {
- if (parent != null) {
+ if (parent != null) {
parent.addTrace(this);
}
@@ -131,9 +131,9 @@ public class AbandonedTrace {
* object trace list.
*/
protected void setStackTrace() {
- if (config == null) {
- return;
- }
+ if (config == null) {
+ return;
+ }
if (config.getLogAbandoned()) {
createdBy = new AbandonedObjectException();
}
@@ -167,9 +167,9 @@ public class AbandonedTrace {
*
* @return List of objects
*/
- protected List getTrace() {
+ protected List<AbandonedTrace> getTrace() {
synchronized (this.traceList) {
- return new ArrayList(traceList);
+ return new ArrayList<AbandonedTrace>(traceList);
}
}
@@ -182,9 +182,9 @@ public class AbandonedTrace {
createdBy.printStackTrace(config.getLogWriter());
}
synchronized(this.traceList) {
- Iterator it = this.traceList.iterator();
+ Iterator<AbandonedTrace> it = this.traceList.iterator();
while (it.hasNext()) {
- AbandonedTrace at = (AbandonedTrace)it.next();
+ AbandonedTrace at = it.next();
at.printStackTrace();
}
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
b/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
index 47cc1c0..890863d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
@@ -448,11 +448,11 @@ public class DelegatingConnection extends AbandonedTrace
// The JDBC spec requires that a Connection close any open
// Statement's when it is closed.
// DBCP-288. Not all the traced objects will be statements
- List traces = getTrace();
+ List<AbandonedTrace> traces = getTrace();
if(traces != null) {
- Iterator traceIter = traces.iterator();
+ Iterator<AbandonedTrace> traceIter = traces.iterator();
while (traceIter.hasNext()) {
- Object trace = traceIter.next();
+ AbandonedTrace trace = traceIter.next();
if (trace instanceof Statement) {
((Statement) trace).close();
} else if (trace instanceof ResultSet) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingStatement.java
b/java/org/apache/tomcat/dbcp/dbcp/DelegatingStatement.java
index 905c3b0..b8622de 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingStatement.java
@@ -167,9 +167,9 @@ public class DelegatingStatement extends AbandonedTrace
implements Statement {
// ResultSet's when it is closed.
// FIXME The PreparedStatement we're wrapping should handle
this for us.
// See bug 17301 for what could happen when ResultSets are
closed twice.
- List resultSets = getTrace();
+ List<AbandonedTrace> resultSets = getTrace();
if( resultSets != null) {
- ResultSet[] set = (ResultSet[]) resultSets.toArray(new
ResultSet[resultSets.size()]);
+ ResultSet[] set = resultSets.toArray(new
ResultSet[resultSets.size()]);
for (int i = 0; i < set.length; i++) {
set[i].close();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
