Updated Branches: refs/heads/txn-refactor 7364d55cc -> 711ad386d
Random cleanup Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/711ad386 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/711ad386 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/711ad386 Branch: refs/heads/txn-refactor Commit: 711ad386d19786cbfa1a51adb416d4614c4e9c6e Parents: 7364d55 Author: Darren Shepherd <[email protected]> Authored: Wed Oct 16 16:18:49 2013 -0700 Committer: Darren Shepherd <[email protected]> Committed: Wed Oct 16 16:18:49 2013 -0700 ---------------------------------------------------------------------- .../src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java | 3 --- engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java | 1 - .../db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java | 2 +- server/src/com/cloud/api/ApiServer.java | 3 +++ 4 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/711ad386/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java ---------------------------------------------------------------------- diff --git a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java index 204a28e..8681263 100755 --- a/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java +++ b/engine/orchestration/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java @@ -43,8 +43,6 @@ import javax.naming.ConfigurationException; import javax.net.ssl.SSLContext; import javax.net.ssl.SSLEngine; -import net.sf.ehcache.transaction.local.TransactionListener; - import org.apache.cloudstack.framework.config.ConfigDepot; import org.apache.cloudstack.framework.config.ConfigKey; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; @@ -89,7 +87,6 @@ import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.QueryBuilder; import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.nio.Link; import com.cloud.utils.nio.Task; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/711ad386/engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java ---------------------------------------------------------------------- diff --git a/engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java b/engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java index d5cd489..aeeb6d5 100644 --- a/engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java +++ b/engine/schema/src/com/cloud/upgrade/dao/Upgrade307to410.java @@ -29,7 +29,6 @@ import com.cloud.utils.PropertiesUtil; import com.cloud.utils.crypt.EncryptionSecretKeyChecker; import org.apache.log4j.Logger; -import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; import org.jasypt.encryption.pbe.StandardPBEStringEncryptor; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/711ad386/framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java ---------------------------------------------------------------------- diff --git a/framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java b/framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java index 7341b4d..a2263e5 100644 --- a/framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java +++ b/framework/db/src/com/cloud/utils/db/TransactionCallbackNoReturn.java @@ -4,7 +4,7 @@ public abstract class TransactionCallbackNoReturn implements TransactionCallback @Override public Object doInTransaction(TransactionStatus status) { - doInTransaction(status); + doInTransactionWithoutResult(status); return null; } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/711ad386/server/src/com/cloud/api/ApiServer.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index 329b3d5..aedf68b 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -147,6 +147,7 @@ import com.cloud.utils.component.PluggableService; import com.cloud.utils.concurrency.NamedThreadFactory; import com.cloud.utils.db.EntityManager; import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.TransactionLegacy; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.exception.ExceptionProxyObject; @@ -705,6 +706,8 @@ public class ApiServer extends ManagerBase implements HttpRequestHandler, ApiSer } } + TransactionLegacy txn = TransactionLegacy.open(TransactionLegacy.CLOUD_DB); + txn.close(); User user = null; // verify there is a user with this api key Pair<User, Account> userAcctPair = _accountMgr.findUserByApiKey(apiKey);
