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:43:59 UTC

[42/47] git commit: updated refs/heads/master to c910196

Update to 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/80509f9b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/80509f9b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/80509f9b

Branch: refs/heads/master
Commit: 80509f9ba28db88a60447da3f151ea88757137a8
Parents: 205a77a
Author: Darren Shepherd <da...@gmail.com>
Authored: Wed Oct 23 11:03:47 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Wed Oct 23 11:03:47 2013 -0700

----------------------------------------------------------------------
 server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/80509f9b/server/src/com/cloud/server/ConfigurationServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 51f99d6..0676db8 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -311,7 +311,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
 
 
     private void templateDetailsInitIfNotExist(long id, String name, String value) {
-        Transaction txn = Transaction.currentTxn();
+        TransactionLegacy txn = TransactionLegacy.currentTxn();
         PreparedStatement stmt = null;
         PreparedStatement stmtInsert = null;
         boolean insert = false;
@@ -345,7 +345,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio
 
     private void initiateXenServerPVDriverVersion() {
         String pvdriverversion = Config.XenPVdriverVersion.getDefaultValue();
-        Transaction txn = Transaction.currentTxn();
+        TransactionLegacy txn = TransactionLegacy.currentTxn();
         PreparedStatement pstmt = null;
         ResultSet rs1 = null;
         ResultSet rs2 = null;