--- old/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java	2011-11-29 12:28:44.000000000 -0500
+++ new/src/share/classes/javax/sql/rowset/serial/SQLOutputImpl.java	2011-11-29 12:28:44.000000000 -0500
@@ -60,7 +60,7 @@
      * A reference to an existing vector that
      * contains the attributes of a <code>Struct</code> object.
      */
-    private Vector attribs;
+    private Vector<Object> attribs;
 
     /**
      * The type map the driver supplies to a newly created
@@ -70,7 +70,7 @@
      * method will in turn call the appropriate
      * <code>SQLOutputImpl</code> writer methods.
      */
-    private Map map;
+    private Map<String,Class<?>> map;
 
     /**
      * Creates a new <code>SQLOutputImpl</code> object
@@ -93,7 +93,7 @@
      * @throws SQLException if the <code>attributes</code> or the <code>map</code>
      *        is a <code>null</code> value
      */
-    public SQLOutputImpl(Vector<?> attributes, Map<String,?> map)
+    public SQLOutputImpl(Vector<Object> attributes, Map<String,Class<?>> map)
         throws SQLException
     {
         if ((attributes == null) || (map == null)) {