[jbosstools-commits] JBoss Tools SVN: r37590 - in trunk/hibernatetools/plugins: org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5 and 1 other directories.

Author: dgeraskov Date: 2011-12-30 06:11:21 -0500 (Fri, 30 Dec 2011) New Revision: 37590 Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java Log: https://issues.jboss.org/browse/JBIDE-10501 Check extension session factory for null instead of console configuration. Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java =================================================================== --- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java 2011-12-30 01:05:24 UTC (rev 37589) +++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/actions/ExecuteQueryAction.java 2011-12-30 11:11:21 UTC (rev 37590) @@ -63,9 +63,9 @@ ConsoleConfiguration cfg = queryEditor.getConsoleConfiguration(); if (cfg != null) { - if (!cfg.isSessionFactoryCreated()) { + if (!cfg.getHibernateExtension().isSessionFactoryCreated()) { if (queryEditor.askUserForConfiguration(cfg.getName())) { - if (cfg.getConfiguration() == null) { + if (!cfg.getHibernateExtension().hasConfiguration()) { try { cfg.build(); } catch (HibernateException he) { @@ -75,7 +75,7 @@ ' ' + cfg.getName(), he); } } - if (cfg.getConfiguration() != null) { + if (cfg.getHibernateExtension().hasConfiguration()) { cfg.buildSessionFactory(); queryEditor.executeQuery(cfg); } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-12-30 01:05:24 UTC (rev 37589) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2011-12-30 11:11:21 UTC (rev 37590) @@ -315,4 +315,9 @@ } }); } + + @Override + public boolean isSessionFactoryCreated() { + return sessionFactory != null; + } } Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-12-30 01:05:24 UTC (rev 37589) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2011-12-30 11:11:21 UTC (rev 37590) @@ -329,4 +329,8 @@ }); } + @Override + public boolean isSessionFactoryCreated() { + return sessionFactory != null; + } } \ No newline at end of file