Author: vanto
Date: Mon Nov 26 21:16:46 2012
New Revision: 1413849
URL: http://svn.apache.org/viewvc?rev=1413849&view=rev
Log:
memory leak in tests fixed.
Modified:
ode/branches/ode-1.3.6.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
Modified:
ode/branches/ode-1.3.6.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
URL:
http://svn.apache.org/viewvc/ode/branches/ode-1.3.6.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java?rev=1413849&r1=1413848&r2=1413849&view=diff
==============================================================================
---
ode/branches/ode-1.3.6.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
(original)
+++
ode/branches/ode-1.3.6.x/axis2-war/src/test/java/org/apache/ode/axis2/Axis2TestBase.java
Mon Nov 26 21:16:46 2012
@@ -166,6 +166,7 @@ public abstract class Axis2TestBase {
@BeforeMethod
protected void setUp() throws Exception {
+ System.out.println("##### Running "+getClass().getName());
log.debug("##### Running "+getClass().getName());
/**
* 1. If no settings are given from buildr, the test runs with the
default config directory.
Modified:
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
URL:
http://svn.apache.org/viewvc/ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java?rev=1413849&r1=1413848&r2=1413849&view=diff
==============================================================================
---
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
(original)
+++
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/SessionManager.java
Mon Nov 26 21:16:46 2012
@@ -151,4 +151,10 @@ public class SessionManager {
String guid = props.getProperty(PROP_GUID);
return _dataSources.get(guid).getConnection();
}
+
+ public void shutdown() {
+ _sessionFactory.close();
+ _dataSources.remove(_uuid);
+ _txManagers.remove(_uuid);
+ }
}
Modified:
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
URL:
http://svn.apache.org/viewvc/ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java?rev=1413849&r1=1413848&r2=1413849&view=diff
==============================================================================
---
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
(original)
+++
ode/branches/ode-1.3.6.x/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java
Mon Nov 26 21:16:46 2012
@@ -165,7 +165,7 @@ public class BpelDAOConnectionFactoryImp
}
public void shutdown() {
- // Not too much to do for hibernate.
+ _sessionManager.shutdown();
}
private String guessDialect(DataSource dataSource) throws Exception {
