src/share/classes/com/sun/rowset/internal/XmlReaderContentHandler.java

*** 69,86 ****
   *
   */
  
  public class XmlReaderContentHandler extends DefaultHandler {
  
!     private HashMap propMap;
!     private HashMap colDefMap;
!     private HashMap dataMap;
  
!     private HashMap typeMap;
  
!     private Vector updates;
!     private Vector keyCols;
  
      private String columnValue;
      private String propertyValue;
      private String metaDataValue;
  
--- 69,86 ----
   *
   */
  
  public class XmlReaderContentHandler extends DefaultHandler {
  
!     private HashMap<String, Integer> propMap;
!     private HashMap<String, Integer> colDefMap;
!     private HashMap<String, Integer> dataMap;
  
!     private HashMap<String,Class<?>> typeMap;
  
!     private Vector<Object[]> updates;
!     private Vector<String> keyCols;
  
      private String columnValue;
      private String propertyValue;
      private String metaDataValue;
  
*** 436,446 ****
  
          // set-up the token maps
          initMaps();
  
          // allocate the collection for the updates
!         updates = new Vector();
  
          // start out with the empty string
          columnValue = "";
          propertyValue = "";
          metaDataValue = "";
--- 436,446 ----
  
          // set-up the token maps
          initMaps();
  
          // allocate the collection for the updates
!         updates = new Vector<Object[]>();
  
          // start out with the empty string
          columnValue = "";
          propertyValue = "";
          metaDataValue = "";
*** 475,507 ****
       * <code>switch</code> statement.
       */
      private void initMaps() {
          int items, i;
  
!         propMap = new HashMap();
          items = properties.length;
  
          for (i=0;i<items;i++) {
              propMap.put(properties[i], Integer.valueOf(i));
          }
  
!         colDefMap = new HashMap();
          items = colDef.length;
  
          for (i=0;i<items;i++) {
              colDefMap.put(colDef[i], Integer.valueOf(i));
          }
  
!         dataMap = new HashMap();
          items = data.length;
  
          for (i=0;i<items;i++) {
              dataMap.put(data[i], Integer.valueOf(i));
          }
  
          //Initialize connection map here
!         typeMap = new HashMap();
      }
  
      public void startDocument() throws SAXException {
      }
  
--- 475,507 ----
       * <code>switch</code> statement.
       */
      private void initMaps() {
          int items, i;
  
!         propMap = new HashMap<String, Integer>();
          items = properties.length;
  
          for (i=0;i<items;i++) {
              propMap.put(properties[i], Integer.valueOf(i));
          }
  
!         colDefMap = new HashMap<String, Integer>();
          items = colDef.length;
  
          for (i=0;i<items;i++) {
              colDefMap.put(colDef[i], Integer.valueOf(i));
          }
  
!         dataMap = new HashMap<String, Integer>();
          items = data.length;
  
          for (i=0;i<items;i++) {
              dataMap.put(data[i], Integer.valueOf(i));
          }
  
          //Initialize connection map here
!         typeMap = new HashMap<String,Class<?>>();
      }
  
      public void startDocument() throws SAXException {
      }
  
*** 1073,1083 ****
              break;
          case KeycolsTag:
              break;
          case PropColumnTag:
              if (keyCols == null)
!                 keyCols = new Vector();
              keyCols.add(s);
              break;
          case MapTag:
              break;
          case MaxFieldSizeTag:
--- 1073,1083 ----
              break;
          case KeycolsTag:
              break;
          case PropColumnTag:
              if (keyCols == null)
!                 keyCols = new Vector<String>();
              keyCols.add(s);
              break;
          case MapTag:
              break;
          case MaxFieldSizeTag: