Clean-up fix for 121422 Adding databinding after migrating 5.5.x project fails designer_refactoring2_root gdb60-perf-wip_root
authorjbaker@netbeans.org
Wed, 07 Nov 2007 23:37:26 +0000
changeset 18423dafd879e02e
parent 1841 54fad3ca3871
child 1843 c45b38156e05
Clean-up fix for 121422 Adding databinding after migrating 5.5.x project fails
Remove duplicated condition
visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java
     1.1 --- a/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java	Wed Nov 07 23:18:07 2007 +0000
     1.2 +++ b/visualweb.dataconnectivity/src/org/netbeans/modules/visualweb/dataconnectivity/sql/DesignTimeDataSourceHelper.java	Wed Nov 07 23:37:26 2007 +0000
     1.3 @@ -535,7 +535,7 @@
     1.4              DatabaseSettingsImporter.getInstance().updateWebXml(currentProj, jdbcResources);
     1.5              
     1.6              // Support for Creator 2 projects and a hack - serverplugin not detecting datasources in project
     1.7 -            if (jdbcResource == null  && dynamicDataSources.length > 0) {
     1.8 +            if (jdbcResource == null) {
     1.9                  RequestedJdbcResource[] resources = null;                
    1.10                  DataSourceInfo dsInfo = null;
    1.11                  DesignTimeDataSourceService dataSourceService = null;
    1.12 @@ -564,7 +564,7 @@
    1.13                          }
    1.14                      }
    1.15                  }
    1.16 -            } else if (dynamicDataSources.length > 0) {
    1.17 +            } else {
    1.18                  // Check if datasource exists in the context.  If it doesn't exist then bind the datasource .
    1.19                  Iterator it = jdbcResources.iterator();
    1.20                  boolean found = false;