1.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardSelectionPanelUI.java Sun Mar 22 11:27:19 2009 +0100
1.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardSelectionPanelUI.java Mon Mar 23 12:23:58 2009 +0100
1.3 @@ -88,6 +88,7 @@
1.4 import java.awt.event.MouseAdapter;
1.5 import java.awt.event.MouseEvent;
1.6 import java.sql.Connection;
1.7 +import java.sql.SQLException;
1.8 import java.util.Collections;
1.9
1.10 /**
1.11 @@ -382,7 +383,13 @@
1.12 this.dbmodel = new DatabaseModelImpl(this.selectedConnection.getDisplayName(), def);
1.13
1.14 final String[][] tableList = DBMetaData.getTablesAndViews("", this.selectedConnection.getSchema(), "", true,connection);
1.15 - if ("ORACLE".equalsIgnoreCase(this.dbtype) && DBMetaData.getDatabaseMajorVersion(connection) >= 10) { // NOI18N
1.16 + Integer oracleMajorVersion = null;
1.17 + try {
1.18 + oracleMajorVersion = DBMetaData.getDatabaseMajorVersion(connection);
1.19 + } catch (SQLException x) {
1.20 + // #155003: ignore this
1.21 + }
1.22 + if ("ORACLE".equalsIgnoreCase(this.dbtype) && oracleMajorVersion != null && oracleMajorVersion >= 10) { // NOI18N
1.23 recycleBinTables = DBMetaData.getOracleRecycleBinTables(connection);
1.24 } else {
1.25 recycleBinTables = Collections.EMPTY_LIST;