java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java | 5 +----
java/code/src/com/redhat/rhn/webapp/RhnServletListener.java | 6 ++++++
2 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit b0510de4b735a33baeb39ca72327747250faf727
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Tue Nov 12 09:21:41 2013 +0100
TestFactoryWrapperTest: avoid adding TestImpl.hbm.xml twice
ConnectionManager already includes the com.redhat.rhn.domain package, adding com.redhat.rhn.domain.test here results in a DuplicateMappingException. This is not fatal but can break subsequent tests.
diff --git a/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java b/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
index a615fbd..beb9629 100644
--- a/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
+++ b/java/code/src/com/redhat/rhn/common/hibernate/test/TestFactoryWrapperTest.java
@@ -41,16 +41,13 @@ import junit.framework.TestSuite;
*/
public class TestFactoryWrapperTest extends RhnBaseTestCase {
private static Logger log = Logger.getLogger(TestFactoryWrapperTest.class);
- private static final String[] TEST_PACKAGE_NAMES =
- {"com.redhat.rhn.domain.test"};
-
public TestFactoryWrapperTest(String name) {
super(name);
}
public void setUp() {
- HibernateFactory.createSessionFactory(TEST_PACKAGE_NAMES);
+ HibernateFactory.createSessionFactory();
}
public void testLookupReturnNull() throws Exception {
commit f1f5c4b949a1eaf64151985490214da3025631fd
Author: Silvio Moioli <smoioli(a)suse.de>
Date: Mon Nov 11 12:07:15 2013 +0100
RhnServletListener: do not break subsequent testcases
diff --git a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java
index b672430..02fdb64 100644
--- a/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java
+++ b/java/code/src/com/redhat/rhn/webapp/RhnServletListener.java
@@ -136,6 +136,12 @@ public class RhnServletListener implements ServletContextListener {
stopHibernate();
logStop("Hibernate");
+ if (sce == null) {
+ // this has been called from the testsuite, next steps would
+ // break subsequent tests
+ return;
+ }
+
// This manually deregisters JDBC driver,
// which prevents Tomcat from complaining about memory leaks
Enumeration<Driver> drivers = DriverManager.getDrivers();