You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2011/07/29 17:45:14 UTC

svn commit: r1152277 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java

Author: markt
Date: Fri Jul 29 15:45:13 2011
New Revision: 1152277

URL: http://svn.apache.org/viewvc?rev=1152277&view=rev
Log:
Generics / Java 6

Modified:
    commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java?rev=1152277&r1=1152276&r2=1152277&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/DelegatingResultSet.java Fri Jul 29 15:45:13 2011
@@ -661,7 +661,7 @@ public class DelegatingResultSet extends
     { 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
     { 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
@@ -1245,6 +1245,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateClob(String columnLabel, Reader reader) throws SQLException {
         try {
             _res.updateClob(columnLabel, reader);
@@ -1254,6 +1255,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNClob(int columnIndex, Reader reader) throws SQLException {
         try {
             _res.updateNClob(columnIndex, reader);
@@ -1263,6 +1265,7 @@ public class DelegatingResultSet extends
         }
     }
 
+    @Override
     public void updateNClob(String columnLabel, Reader reader) throws SQLException {
         try {
             _res.updateNClob(columnLabel, reader);