From jbosstools-commits at lists.jboss.org Wed Jan 26 10:34:32 2011 Content-Type: multipart/mixed; boundary="===============3002579523139951452==" MIME-Version: 1.0 From: jbosstools-commits at lists.jboss.org To: jbosstools-commits at lists.jboss.org Subject: [jbosstools-commits] JBoss Tools SVN: r28615 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench. Date: Wed, 26 Jan 2011 10:34:32 -0500 Message-ID: <201101261534.p0QFYWDr015311@svn01.web.mwc.hst.phx2.redhat.com> --===============3002579523139951452== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Author: vyemialyanchyk Date: 2011-01-26 10:34:32 -0500 (Wed, 26 Jan 2011) New Revision: 28615 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hiber= nate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java Log: https://issues.jboss.org/browse/JBIDE-8219 - fixed Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/or= g/hibernate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.ja= va =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 201= 1-01-26 15:34:03 UTC (rev 28614) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibe= rnate/eclipse/console/workbench/LazyDatabaseSchemaWorkbenchAdapter.java 201= 1-01-26 15:34:32 UTC (rev 28615) @@ -59,13 +59,13 @@ = ConsoleConfiguration consoleConfiguration =3D dbs.getConsoleConfiguratio= n(); = - try{ + try { DefaultDatabaseCollector db =3D readDatabaseSchema(monitor, consoleConf= iguration, dbs.getReverseEngineeringStrategy()); = List result =3D new ArrayList(); = Iterator>> qualifierEntries =3D db.getQua= lifierEntries(); - while ( qualifierEntries.hasNext() ) { + while (qualifierEntries.hasNext()) { Map.Entry> entry =3D qualifierEntries.next(); result.add(new TableContainer(entry.getKey(), entry.getValue())); } @@ -77,7 +77,7 @@ } = }); - } catch (HibernateException e){ + } catch (HibernateException e) { HibernateConsolePlugin.getDefault().logErrorMessage(HibernateConsoleMes= sages.LazyDatabaseSchemaWorkbenchAdapter_problems_while_reading_database_sc= hema, e); String out =3D NLS.bind(HibernateConsoleMessages.LazyDatabaseSchemaWork= benchAdapter_reading_schema_error, e.getMessage()); return new Object[]{out}; @@ -115,11 +115,13 @@ JDBCReader reader =3D JDBCReaderFactory.newJDBCReader(configuration.g= etProperties(), settings, strategy); db =3D new DefaultDatabaseCollector(reader.getMetaDataDialect()); reader.readDatabaseSchema(db, settings.getDefaultCatalogName(), setti= ngs.getDefaultSchemaName(), new ProgressListenerMonitor(monitor)); - } catch(HibernateException he) { + } catch (HibernateException he) { throw he; + } catch (UnsupportedOperationException he) { + throw new HibernateException(he); } - finally { - if (connectionProvider!=3Dnull) { + finally { + if (connectionProvider !=3D null) { connectionProvider.close(); } } --===============3002579523139951452==--