diff --git a/engine/schema/src/main/java/com/cloud/projects/dao/ProjectDaoImpl.java b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectDaoImpl.java index 560f8dc79fd..5deb8586120 100644 --- a/engine/schema/src/main/java/com/cloud/projects/dao/ProjectDaoImpl.java +++ b/engine/schema/src/main/java/com/cloud/projects/dao/ProjectDaoImpl.java @@ -33,7 +33,6 @@ import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; -import com.cloud.utils.db.TransactionLegacy; @Component public class ProjectDaoImpl extends GenericDaoBase implements ProjectDao { @@ -71,22 +70,8 @@ public class ProjectDaoImpl extends GenericDaoBase implements P @Override @DB public boolean remove(Long projectId) { - boolean result = false; - TransactionLegacy txn = TransactionLegacy.currentTxn(); - txn.start(); - ProjectVO projectToRemove = findById(projectId); - projectToRemove.setName(null); - if (!update(projectId, projectToRemove)) { - s_logger.warn("Failed to reset name for the project id=" + projectId + " as a part of project remove"); - return false; - } - _tagsDao.removeByIdAndType(projectId, ResourceObjectType.Project); - result = super.remove(projectId); - txn.commit(); - - return result; - + return super.remove(projectId); } @Override