incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ahu...@apache.org
Subject [1/2] git commit: fixed tab problems
Date Thu, 25 Oct 2012 20:14:00 GMT
Updated Branches:
  refs/heads/master e531763d8 -> 525f96b7a


fixed tab problems


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/525f96b7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/525f96b7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/525f96b7

Branch: refs/heads/master
Commit: 525f96b7aee1298b6597ca1ff674a44b9309873f
Parents: 7b7f4cd
Author: Alex Huang <alex.huang@citrix.com>
Authored: Thu Oct 25 13:13:47 2012 -0700
Committer: Alex Huang <alex.huang@citrix.com>
Committed: Thu Oct 25 13:13:47 2012 -0700

----------------------------------------------------------------------
 utils/src/com/cloud/utils/db/Transaction.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/525f96b7/utils/src/com/cloud/utils/db/Transaction.java
----------------------------------------------------------------------
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
index 3a669e1..7be9ee3 100755
--- a/utils/src/com/cloud/utils/db/Transaction.java
+++ b/utils/src/com/cloud/utils/db/Transaction.java
@@ -130,7 +130,7 @@ public class Transaction {
     // the existing DAO features
     //
     public void transitToUserManagedConnection(Connection conn) {
-    	assert(_conn == null /*&& _stack.size() <= 1*/) : "Can't change to a user
managed connection unless the stack is empty and the db connection is null, you may have forgotten
to invoke transitToAutoManagedConnection to close out the DB connection: " + toString();
+        assert(_conn == null /*&& _stack.size() <= 1*/) : "Can't change to a user
managed connection unless the stack is empty and the db connection is null, you may have forgotten
to invoke transitToAutoManagedConnection to close out the DB connection: " + toString();
         _conn = conn;
         _dbId = CONNECTED_DB;
     }
@@ -747,8 +747,8 @@ public class Transaction {
         }
 
         try {
-        	// we should only close db connection when it is not user managed
-            if(this._dbId != CONNECTED_DB) {
+            // we should only close db connection when it is not user managed
+            if (this._dbId != CONNECTED_DB) {
                 if (s_connLogger.isTraceEnabled()) {
                     s_connLogger.trace("Closing DB connection: dbconn" + System.identityHashCode(_conn));
                 }                                


Mime
View raw message