From a86f49c106522855f64e92215b4e6b4f285ffdcc Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Fri, 15 Jul 2011 10:18:51 -0700
Subject: [PATCH] From Alex - assertion fix

---
 api/src/com/cloud/api/commands/ListIsosCmd.java | 2 --
 utils/src/com/cloud/utils/db/Transaction.java   | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/api/src/com/cloud/api/commands/ListIsosCmd.java b/api/src/com/cloud/api/commands/ListIsosCmd.java
index 9330d730d9b..d28923bfb0b 100755
--- a/api/src/com/cloud/api/commands/ListIsosCmd.java
+++ b/api/src/com/cloud/api/commands/ListIsosCmd.java
@@ -25,14 +25,12 @@ import java.util.Set;
 import org.apache.log4j.Logger;
 
 import com.cloud.api.ApiConstants;
-import com.cloud.api.BaseCmd;
 import com.cloud.api.BaseListCmd;
 import com.cloud.api.Implementation;
 import com.cloud.api.Parameter;
 import com.cloud.api.response.ListResponse;
 import com.cloud.api.response.TemplateResponse;
 import com.cloud.async.AsyncJob;
-import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
diff --git a/utils/src/com/cloud/utils/db/Transaction.java b/utils/src/com/cloud/utils/db/Transaction.java
index 268129802c5..7fbb2f8d954 100755
--- a/utils/src/com/cloud/utils/db/Transaction.java
+++ b/utils/src/com/cloud/utils/db/Transaction.java
@@ -126,13 +126,13 @@ 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: " + 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: " + toString();
         _conn = conn;
         _dbId = CONNECTED_DB;
     }
     
     public void transitToAutoManagedConnection(short dbId) {
-        assert(_stack.size() <= 1) : "Can't change to auto managed connection unless your stack is empty";
+        // assert(_stack.size() <= 1) : "Can't change to auto managed connection unless your stack is empty";
         _dbId = dbId;
         _conn = null;
     }