ODE-1015: Added a check for a system property to skip the setting of isolation level
Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/c5c72831 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/c5c72831 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/c5c72831 Branch: refs/heads/ode-1.3.x Commit: c5c72831cb236206283e2b397bcbc79bffd206a5 Parents: 760ecf9 Author: sathwik <[email protected]> Authored: Wed Jul 23 21:44:36 2014 +0530 Committer: sathwik <[email protected]> Committed: Wed Jul 23 21:44:36 2014 +0530 ---------------------------------------------------------------------- .../apache/ode/store/jpa/DbConfStoreConnectionFactory.java | 8 +++++++- .../org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/c5c72831/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java index 339690f..d71ce50 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java +++ b/bpel-store/src/main/java/org/apache/ode/store/jpa/DbConfStoreConnectionFactory.java @@ -24,6 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.apache.ode.dao.jpa.JpaTxMgrProvider; import org.apache.ode.store.ConfStoreConnection; import org.apache.ode.store.ConfStoreConnectionFactory; +import org.hibernate.cfg.Environment; import javax.persistence.EntityManagerFactory; import javax.persistence.Persistence; @@ -60,7 +61,12 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory propMap.put("openjpa.ConnectionFactoryMode", "managed"); propMap.put("openjpa.FlushBeforeQueries", "false"); propMap.put("openjpa.FetchBatchSize", 1000); - propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed"); + + //dirty hack for ODE-1015 + String skipIsolation = System.getProperty("openjpa.connection.isolation.skip", "N"); + if(skipIsolation.equalsIgnoreCase("N")) + propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed"); + propMap.put("javax.persistence.provider", "org.apache.openjpa.persistence.PersistenceProviderImpl"); if (createDatamodel) propMap.put("openjpa.jdbc.SynchronizeMappings", "buildSchema(ForeignKeys=false)"); http://git-wip-us.apache.org/repos/asf/ode/blob/c5c72831/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java index da2f90b..82fceb4 100644 --- a/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java +++ b/dao-jpa/src/main/java/org/apache/ode/dao/jpa/BPELDAOConnectionFactoryImpl.java @@ -35,6 +35,7 @@ import javax.transaction.Synchronization; import javax.transaction.SystemException; import javax.transaction.Transaction; import javax.transaction.TransactionManager; + import java.util.HashMap; import java.util.Map; import java.util.Properties; @@ -101,7 +102,12 @@ public class BPELDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB propMap.put("openjpa.ConnectionFactoryMode", "managed"); // propMap.put("openjpa.FlushBeforeQueries", "false"); propMap.put("openjpa.FetchBatchSize", 1000); - //propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed"); + + //dirty hack for ODE-1015 + String skipIsolation = System.getProperty("openjpa.connection.isolation.skip", "N"); + if(skipIsolation.equalsIgnoreCase("N")) + propMap.put("openjpa.jdbc.TransactionIsolation", "read-committed"); + if (_dbdictionary != null) propMap.put("openjpa.jdbc.DBDictionary", _dbdictionary);
