Author: dgeraskov Date: 2012-05-21 05:28:51 -0400 (Mon, 21 May 2012) New Revision: 41199 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_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.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-11662 Do not forget to deregister drivers on rebuild 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 2012-05-21 09:21:41 UTC (rev 41198) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_5/src/org/jboss/tools/hibernate3_5/HibernateExtension3_5.java 2012-05-21 09:28:51 UTC (rev 41199) @@ -204,15 +204,20 @@ @Override public boolean reset() { - boolean res = false; + boolean resetted = false; // reseting state if (configuration != null) { configuration = null; - res = true; + resetted = true; } - boolean tmp = closeSessionFactory(); - res = res || tmp; + resetted = resetted | closeSessionFactory() | cleanUpClassLoader(); + executionContext = null; + return resetted; + } + + protected boolean cleanUpClassLoader() { + boolean resetted = false; if (executionContext != null) { executionContext.execute(new Command() { public Object execute() { @@ -230,29 +235,21 @@ } if (fakeDrivers.size() > 0) { fakeDrivers.clear(); - res = true; + resetted = true; } - tmp = cleanUpClassLoader(); - res = res || tmp; - executionContext = null; - return res; - } - - protected boolean cleanUpClassLoader() { - boolean res = false; ClassLoader classLoaderTmp = classLoader; while (classLoaderTmp != null) { if (classLoaderTmp instanceof ConsoleConfigClassLoader) { ((ConsoleConfigClassLoader)classLoaderTmp).close(); - res = true; + resetted = true; } classLoaderTmp = classLoaderTmp.getParent(); } if (classLoader != null) { classLoader = null; - res = true; + resetted = true; } - return res; + return resetted; } @Override Modified: trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java =================================================================== --- trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java 2012-05-21 09:21:41 UTC (rev 41198) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate3_6/src/org/jboss/tools/hibernate3_6/HibernateExtension3_6.java 2012-05-21 09:28:51 UTC (rev 41199) @@ -206,15 +206,20 @@ @Override public boolean reset() { - boolean res = false; + boolean resetted = false; // reseting state if (configuration != null) { configuration = null; - res = true; + resetted = true; } - boolean tmp = closeSessionFactory(); - res = res || tmp; + resetted = resetted | closeSessionFactory() | cleanUpClassLoader(); + executionContext = null; + return resetted; + } + + protected boolean cleanUpClassLoader() { + boolean resetted = false; if (executionContext != null) { executionContext.execute(new Command() { public Object execute() { @@ -232,29 +237,21 @@ } if (fakeDrivers.size() > 0) { fakeDrivers.clear(); - res = true; + resetted = true; } - tmp = cleanUpClassLoader(); - res = res || tmp; - executionContext = null; - return res; - } - - protected boolean cleanUpClassLoader() { - boolean res = false; ClassLoader classLoaderTmp = classLoader; while (classLoaderTmp != null) { if (classLoaderTmp instanceof ConsoleConfigClassLoader) { ((ConsoleConfigClassLoader)classLoaderTmp).close(); - res = true; + resetted = true; } classLoaderTmp = classLoaderTmp.getParent(); } if (classLoader != null) { classLoader = null; - res = true; + resetted = true; } - return res; + return resetted; } @Override 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 2012-05-21 09:21:41 UTC (rev 41198) +++ trunk/hibernatetools/plugins/org.jboss.tools.hibernate4_0/src/org/jboss/tools/hibernate4_0/HibernateExtension4_0.java 2012-05-21 09:28:51 UTC (rev 41199) @@ -216,15 +216,21 @@ @Override public boolean reset() { - boolean res = false; + boolean resetted = false; // reseting state if (configuration != null) { configuration = null; - res = true; + resetted = true; } - boolean tmp = closeSessionFactory(); - res = res || tmp; + resetted = resetted | closeSessionFactory() | cleanUpClassLoader(); + + executionContext = null; + return resetted; + } + + protected boolean cleanUpClassLoader() { + boolean resetted = false; if (executionContext != null) { executionContext.execute(new Command() { public Object execute() { @@ -242,29 +248,21 @@ } if (fakeDrivers.size() > 0) { fakeDrivers.clear(); - res = true; + resetted = true; } - tmp = cleanUpClassLoader(); - res = res || tmp; - executionContext = null; - return res; - } - - protected boolean cleanUpClassLoader() { - boolean res = false; ClassLoader classLoaderTmp = classLoader; while (classLoaderTmp != null) { if (classLoaderTmp instanceof ConsoleConfigClassLoader) { ((ConsoleConfigClassLoader)classLoaderTmp).close(); - res = true; + resetted = true; } classLoaderTmp = classLoaderTmp.getParent(); } if (classLoader != null) { classLoader = null; - res = true; + resetted = true; } - return res; + return resetted; } @Override