### Eclipse Workspace Patch 1.0 #P org.teiid.designer.jdbc Index: src/com/metamatrix/modeler/jdbc/metadata/impl/JdbcTableTypeImpl.java =================================================================== --- src/com/metamatrix/modeler/jdbc/metadata/impl/JdbcTableTypeImpl.java (revision 1812) +++ src/com/metamatrix/modeler/jdbc/metadata/impl/JdbcTableTypeImpl.java (working copy) @@ -45,12 +45,15 @@ final String schemaName = getSchemaName(this); final String catalogName = getCatalogName(this); + boolean isSqlServer = metadata.getClass().getName().endsWith("SQLServerDatabaseMetaData"); + // Get the tables for this type ... ResultSet resultSet = null; try { final String[] tableTypes = new String[]{getName()}; + resultSet = metadata.getTables(catalogName,schemaName,WILDCARD_PATTERN,tableTypes); - while( resultSet.next() ) { + while (resultSet != null && resultSet.next()) { final String tableName = resultSet.getString(3); final String remarks = resultSet.getString(5); final JdbcTableImpl table = new JdbcTableImpl(this,tableName); @@ -58,9 +61,11 @@ children.add(table); } } catch (Throwable t) { - final Object[] params = new Object[]{metadata.getClass().getName(),getJdbcDatabase()}; - final String msg = JdbcPlugin.Util.getString("JdbcTableTypeImpl.Unexpected_exception_while_calling_getTables()_and_processing_results",params); //$NON-NLS-1$ - JdbcPlugin.Util.log(IStatus.WARNING,t,msg); + if (!isSqlServer) { + final Object[] params = new Object[] {metadata.getClass().getName(), getJdbcDatabase()}; + final String msg = JdbcPlugin.Util.getString("JdbcTableTypeImpl.Unexpected_exception_while_calling_getTables()_and_processing_results", params); //$NON-NLS-1$ + JdbcPlugin.Util.log(IStatus.WARNING, t, msg); + } } finally { if ( resultSet != null ) { try {