You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2019/03/22 09:33:50 UTC
[tomcat] branch 7.0.x updated: Generics: typeMap
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 f709250 Generics: typeMap
f709250 is described below
commit f709250834c783782d90a8b9e288eb5b2f63ab4f
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Mar 18 14:34:08 2019 +0000
Generics: typeMap
---
java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp/PoolingDataSource.java | 4 ++--
java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java b/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
index 0b5f50b..979c352 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingCallableStatement.java
@@ -168,7 +168,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement
{ checkOpen(); try { return ((CallableStatement)_stmt).getBigDecimal( parameterIndex); } catch (SQLException e) { handleException(e); return null; } }
@Override
- public Object getObject(int i, Map map) throws SQLException
+ public Object getObject(int i, Map<String, Class<?>> map) throws SQLException
{ checkOpen(); try { return ((CallableStatement)_stmt).getObject( i, map); } catch (SQLException e) { handleException(e); return null; } }
@Override
@@ -376,7 +376,7 @@ public class DelegatingCallableStatement extends DelegatingPreparedStatement
{ checkOpen(); try { return ((CallableStatement)_stmt).getBigDecimal(parameterName); } catch (SQLException e) { handleException(e); return null; } }
@Override
- public Object getObject(String parameterName, Map map) throws SQLException
+ public Object getObject(String parameterName, Map<String, Class<?>> map) throws SQLException
{ checkOpen(); try { return ((CallableStatement)_stmt).getObject(parameterName, map); } catch (SQLException e) { handleException(e); return null; } }
@Override
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java b/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
index c518282..47cc1c0 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingConnection.java
@@ -373,7 +373,7 @@ public class DelegatingConnection extends AbandonedTrace
{ checkOpen(); try { return _conn.getTransactionIsolation(); } catch (SQLException e) { handleException(e); return -1; } }
@Override
- public Map getTypeMap() throws SQLException
+ public Map<String, Class<?>> getTypeMap() throws SQLException
{ checkOpen(); try { return _conn.getTypeMap(); } catch (SQLException e) { handleException(e); return null; } }
@Override
@@ -409,7 +409,7 @@ public class DelegatingConnection extends AbandonedTrace
{ checkOpen(); try { _conn.setTransactionIsolation(level); } catch (SQLException e) { handleException(e); } }
@Override
- public void setTypeMap(Map map) throws SQLException
+ public void setTypeMap(Map<String, Class<?>> map) throws SQLException
{ checkOpen(); try { _conn.setTypeMap(map); } catch (SQLException e) { handleException(e); } }
@Override
diff --git a/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java b/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
index 2812f12..66fe959 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/DelegatingResultSet.java
@@ -661,7 +661,7 @@ public class DelegatingResultSet extends AbandonedTrace implements ResultSet {
{ try { _res.moveToCurrentRow(); } catch (SQLException e) { handleException(e); } }
@Override
- public Object getObject(int i, Map map) throws SQLException
+ public Object getObject(int i, Map<String, Class<?>> map) throws SQLException
{ try { return _res.getObject(i, map); } catch (SQLException e) { handleException(e); return null; } }
@Override
@@ -681,7 +681,7 @@ public class DelegatingResultSet extends AbandonedTrace implements ResultSet {
{ try { return _res.getArray(i); } catch (SQLException e) { handleException(e); return null; } }
@Override
- public Object getObject(String colName, Map map) throws SQLException
+ public Object getObject(String colName, Map<String, Class<?>> map) throws SQLException
{ try { return _res.getObject(colName, map); } catch (SQLException e) { handleException(e); return null; } }
@Override
diff --git a/java/org/apache/tomcat/dbcp/dbcp/PoolingDataSource.java b/java/org/apache/tomcat/dbcp/dbcp/PoolingDataSource.java
index 43b7ce3..fe519cf 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/PoolingDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/PoolingDataSource.java
@@ -277,7 +277,7 @@ public class PoolingDataSource implements DataSource {
}
@Override
- public Map getTypeMap() throws SQLException {
+ public Map<String, Class<?>> getTypeMap() throws SQLException {
checkOpen();
return delegate.getTypeMap();
}
@@ -385,7 +385,7 @@ public class PoolingDataSource implements DataSource {
}
@Override
- public void setTypeMap(Map map) throws SQLException {
+ public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
checkOpen();
delegate.setTypeMap(map);
}
diff --git a/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java b/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
index a83ffa8..43890d3 100644
--- a/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
+++ b/java/org/apache/tomcat/dbcp/dbcp/PoolingDriver.java
@@ -359,7 +359,7 @@ public class PoolingDriver implements Driver {
}
@Override
- public Map getTypeMap() throws SQLException {
+ public Map<String, Class<?>> getTypeMap() throws SQLException {
checkOpen();
return delegate.getTypeMap();
}
@@ -445,7 +445,7 @@ public class PoolingDriver implements Driver {
}
@Override
- public void setTypeMap(Map map) throws SQLException {
+ public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
checkOpen();
delegate.setTypeMap(map);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org