You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2013/10/23 21:44:01 UTC
[44/47] git commit: updated refs/heads/master to c910196
Update to use new Transaction API
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/76c22eae
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/76c22eae
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/76c22eae
Branch: refs/heads/master
Commit: 76c22eae5b20d81208556166363bf24b1216e1b3
Parents: e3280bd
Author: Darren Shepherd <da...@gmail.com>
Authored: Wed Oct 23 11:23:18 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Wed Oct 23 11:23:18 2013 -0700
----------------------------------------------------------------------
.../com/cloud/utils/db/TransactionContextInterceptor.java | 2 +-
.../src/com/cloud/utils/db/TransactionContextListener.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76c22eae/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java
----------------------------------------------------------------------
diff --git a/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java b/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java
index 9dbbbe1..3f5d6d2 100644
--- a/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java
+++ b/framework/db/src/com/cloud/utils/db/TransactionContextInterceptor.java
@@ -28,7 +28,7 @@ public class TransactionContextInterceptor implements MethodInterceptor {
}
@Override
public Object invoke(MethodInvocation m) throws Throwable {
- Transaction txn = Transaction.open(m.getMethod().getName());
+ TransactionLegacy txn = TransactionLegacy.open(m.getMethod().getName());
try {
return m.proceed();
} finally {
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/76c22eae/framework/db/src/com/cloud/utils/db/TransactionContextListener.java
----------------------------------------------------------------------
diff --git a/framework/db/src/com/cloud/utils/db/TransactionContextListener.java b/framework/db/src/com/cloud/utils/db/TransactionContextListener.java
index 30e9e02..db0a706 100644
--- a/framework/db/src/com/cloud/utils/db/TransactionContextListener.java
+++ b/framework/db/src/com/cloud/utils/db/TransactionContextListener.java
@@ -20,19 +20,19 @@ package com.cloud.utils.db;
import org.apache.cloudstack.managed.context.ManagedContextListener;
-public class TransactionContextListener implements ManagedContextListener<Transaction> {
+public class TransactionContextListener implements ManagedContextListener<TransactionLegacy> {
@Override
- public Transaction onEnterContext(boolean reentry) {
+ public TransactionLegacy onEnterContext(boolean reentry) {
if ( ! reentry ) {
- return Transaction.open(Thread.currentThread().getName());
+ return TransactionLegacy.open(Thread.currentThread().getName());
}
return null;
}
@Override
- public void onLeaveContext(Transaction data, boolean reentry) {
+ public void onLeaveContext(TransactionLegacy data, boolean reentry) {
if ( ! reentry ) {
data.close();
}