1.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java	Mon Apr 16 22:16:53 2007 +0000
     1.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/naming/DatabaseSettingsImporter.java	Mon Apr 16 23:23:01 2007 +0000
     1.3 @@ -150,8 +150,8 @@
     1.4              while (it.hasNext()) {
     1.5                  drv = (String) it.next();
     1.6                  if (jf.getEntry(drv.replace('.', '/') + ".class") != null) {//NOI18N
     1.7 -                    String driverName = DriverListUtil.findFreeName(DriverListUtil.getName(drv));
     1.8 -                    if (DataSourceResolver.getInstance().findMatchingDriver(driverName) == null)
     1.9 +                    String driverName = DriverListUtil.getName(drv);
    1.10 +                    if (DataSourceResolver.getInstance().findMatchingDriver(DriverListUtil.getDriver(driverName)) != null)
    1.11                          break;
    1.12                      JDBCDriver driver = JDBCDriver.create(driverName, driverName, drv, new URL[] {driverJar.toURI().toURL()});
    1.13                      try {                        

     2.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/DriverListUtil.java	Mon Apr 16 22:16:53 2007 +0000
     2.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/utils/DriverListUtil.java	Mon Apr 16 23:23:01 2007 +0000
     2.3 @@ -270,6 +270,14 @@
     2.4          
     2.5          return "";
     2.6      }
     2.7 +    
     2.8 +    public static String getDriver(String name) {
     2.9 +        for (int i = 0; i < names.size(); i++)
    2.10 +            if (((String) names.get(i)).equals(name))
    2.11 +                return (String) drivers.get(i);
    2.12 +        
    2.13 +        return "";
    2.14 +    }
    2.15  
    2.16      public static String findFreeName(String name) {
    2.17          String ret;