svn commit: r1413905 - in /ode/branches/ode-1.3.6.x: bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java

[vanto]

Author: vanto
Date: Mon Nov 26 22:45:19 2012
New Revision: 1413905

URL: http://svn.apache.org/viewvc?rev=1413905&view=rev
Log:
another testcase mem leak fixed.

Modified:
    
ode/branches/ode-1.3.6.x/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.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/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/ode/branches/ode-1.3.6.x/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?rev=1413905&r1=1413904&r2=1413905&view=diff
==============================================================================
--- 
ode/branches/ode-1.3.6.x/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 (original)
+++ 
ode/branches/ode-1.3.6.x/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
 Mon Nov 26 22:45:19 2012
@@ -80,13 +80,9 @@ public class DbConfStoreConnectionFactor
 
     private TransactionManager _txMgr;
 
-    private final DataSource _ds;
-
     final SessionFactory _sessionFactory;
 
     public DbConfStoreConnectionFactory(DataSource ds, Properties 
initialProps, boolean createDatamodel, String txFactoryClassName) {
-        _ds = ds;
-
         // Don't want to pollute original properties
         Properties properties = new Properties();
         for (Object prop : initialProps.keySet()) {
@@ -98,7 +94,7 @@ public class DbConfStoreConnectionFactor
 
         if (properties.get(Environment.DIALECT) == null) {
             try {
-                properties.put(Environment.DIALECT, guessDialect(_ds));
+                properties.put(Environment.DIALECT, guessDialect(ds));
             } catch (Exception ex) {
                 String errmsg = 
__msgs.msgOdeInitHibernateDialectDetectFailed();
                 __log.error(errmsg, ex);

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=1413905&r1=1413904&r2=1413905&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 22:45:19 2012
@@ -166,6 +166,8 @@ public class BpelDAOConnectionFactoryImp
 
     public void shutdown() {
         _sessionManager.shutdown();
+        _ds = null;
+        _sessionManager = null;
     }
 
     private String guessDialect(DataSource dataSource) throws Exception {