Updated Branches: refs/heads/master 8d7427e7e -> 7159ad390 refs/heads/ode-1.3.6.x f7fb73131 -> 8493242bc
fixing a class loading issue. Project: http://git-wip-us.apache.org/repos/asf/ode/repo Commit: http://git-wip-us.apache.org/repos/asf/ode/commit/37549335 Tree: http://git-wip-us.apache.org/repos/asf/ode/tree/37549335 Diff: http://git-wip-us.apache.org/repos/asf/ode/diff/37549335 Branch: refs/heads/ode-1.3.6.x Commit: 375493358b5d91c42a13da82259653e3dbf20a22 Parents: f7fb731 Author: Tammo van Lessen <[email protected]> Authored: Mon May 13 23:09:56 2013 +0200 Committer: Tammo van Lessen <[email protected]> Committed: Tue May 14 01:54:26 2013 +0200 ---------------------------------------------------------------------- .../java/org/apache/ode/il/dbutil/Database.java | 3 +- .../store/hib/DbConfStoreConnectionFactory.java | 25 +++++++-------- .../daohib/bpel/BpelDAOConnectionFactoryImpl.java | 20 ++++++------ 3 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode/blob/37549335/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java ---------------------------------------------------------------------- diff --git a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java index b74c85a..80a0a00 100644 --- a/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java +++ b/bpel-epr/src/main/java/org/apache/ode/il/dbutil/Database.java @@ -279,7 +279,8 @@ public class Database { BpelDAOConnectionFactoryJDBC cf; try { - cf = (BpelDAOConnectionFactoryJDBC) Class.forName(pClassName).newInstance(); + Class<?> clazz = this.getClass().getClassLoader().loadClass(pClassName); + cf = (BpelDAOConnectionFactoryJDBC) clazz.newInstance(); } catch (Exception ex) { String errmsg = __msgs.msgDAOInstantiationFailed(pClassName); __log.error(errmsg, ex); http://git-wip-us.apache.org/repos/asf/ode/blob/37549335/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java ---------------------------------------------------------------------- diff --git a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java index 1806b76..b11e15d 100644 --- a/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java +++ b/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java @@ -18,6 +18,17 @@ */ package org.apache.ode.store.hib; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.sql.SQLException; +import java.util.HashMap; +import java.util.Map; +import java.util.Properties; +import java.util.concurrent.ConcurrentHashMap; + +import javax.sql.DataSource; +import javax.transaction.TransactionManager; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.iapi.BpelEngineException; @@ -36,17 +47,6 @@ import org.hibernate.connection.ConnectionProvider; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.DialectFactory; -import javax.sql.DataSource; -import javax.transaction.TransactionManager; - -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.ConcurrentHashMap; - public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory { private static final Log __log = LogFactory.getLog(DbConfStoreConnectionFactory.class); @@ -133,11 +133,10 @@ public class DbConfStoreConnectionFactory implements ConfStoreConnectionFactory return new ConfStoreConnectionHib(_sessionFactory.getCurrentSession()); } - @SuppressWarnings("unchecked") private void initTxMgr(String txFactoryClassName) { __log.info("ProcessStore initializing transaction manager using " + txFactoryClassName); try { - Class txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName); + Class<?> txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName); Object txFact = txFactClass.newInstance(); _txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact); } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/ode/blob/37549335/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java ---------------------------------------------------------------------- diff --git a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java index 9d28de2..56558ed 100644 --- a/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java +++ b/dao-hibernate/src/main/java/org/apache/ode/daohib/bpel/BpelDAOConnectionFactoryImpl.java @@ -18,6 +18,15 @@ */ package org.apache.ode.daohib.bpel; +import java.sql.Connection; +import java.sql.DatabaseMetaData; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Properties; + +import javax.sql.DataSource; +import javax.transaction.TransactionManager; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ode.bpel.dao.BpelDAOConnection; @@ -30,14 +39,6 @@ import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.dialect.DialectFactory; -import javax.sql.DataSource; -import javax.transaction.TransactionManager; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.util.HashMap; -import java.util.Properties; -import java.util.Enumeration; - /** * Hibernate-based {@link org.apache.ode.bpel.dao.BpelDAOConnectionFactory} * implementation. @@ -69,7 +70,6 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB /** * @see org.apache.ode.bpel.dao.BpelDAOConnectionFactory#init(java.util.Properties) */ - @SuppressWarnings("unchecked") public void init(Properties initialProps) { if (_ds == null) { String errmsg = "setDataSource() not called!"; @@ -123,7 +123,7 @@ public class BpelDAOConnectionFactoryImpl implements BpelDAOConnectionFactoryJDB properties.put(Environment.ISOLATION, level); if (__log.isDebugEnabled()) { - Enumeration names = properties.propertyNames(); + Enumeration<?> names = properties.propertyNames(); __log.debug("Properties passed to Hibernate:"); while (names.hasMoreElements()) { String name = (String) names.nextElement();
