OO-872: don't delete the lifecycle before the repository entry is updated

src/main/java/org/olat/repository/RepositoryManager.java

@@ -922,12 +922,12 @@ public class RepositoryManager extends BasicManager {
 		}
 		reloadedRe.setLifecycle(cycle);
 		
-		RepositoryEntry updatedRe = DBFactory.getInstance().getCurrentEntityManager().merge(reloadedRe);
+		RepositoryEntry updatedRe = dbInstance.getCurrentEntityManager().merge(reloadedRe);
 		if(cycleToDelete != null) {
-			DBFactory.getInstance().getCurrentEntityManager().remove(cycleToDelete);
+			dbInstance.getCurrentEntityManager().remove(cycleToDelete);
 		}
 		
-		DBFactory.getInstance().commit();
+		dbInstance.commit();
 		return updatedRe;
 	}
 

src/main/java/org/olat/repository/controllers/RepositoryEditDescriptionController.java

@@ -388,11 +388,7 @@ public class RepositoryEditDescriptionController extends FormBasicController {
 			}
 			
 			if("none".equals(type)) {
-				RepositoryEntryLifecycle cycle = repositoryEntry.getLifecycle();
 				repositoryEntry.setLifecycle(null);
-				if(cycle != null && cycle.isPrivateCycle()) {
-					lifecycleDao.deleteLifecycle(cycle);
-				}
 			} else if("public".equals(type)) {
 				String key = publicDatesEl.getSelectedKey();
 				if(StringHelper.isLong(key)) {