Merge OpenOLAT 8.2 to OpenOLAT default branch with d889e0a7a8422bc41d42d3d0f95d3959edd72050

src/main/java/org/olat/portfolio/manager/EPStructureManager.java

@@ -1006,12 +1006,13 @@ public class EPStructureManager extends BasicManager {
 		if(map == null) {
 			return;//nothing to delete
 		}
+
+		//already delete in removeStructureRecursively: deletePortfolioMapTemplateRecursively((EPStructureElement)map);
 		removeStructureRecursively(map);
-		deletePortfolioMapTemplateRecursively((EPStructureElement)map); 
-		dbInstance.deleteObject(map);
+		//already delete in removeStructureRecursively: dbInstance.deleteObject(map);
 	}
 	
-	private void deletePortfolioMapTemplateRecursively(EPStructureElement element) {
+	/*private void deletePortfolioMapTemplateRecursively(EPStructureElement element) {
 		element.getInternalArtefacts().clear();
 		element.setRoot(null);
 		element.setRootMap(null);
@@ -1020,7 +1021,7 @@ public class EPStructureManager extends BasicManager {
 			deletePortfolioMapTemplateRecursively((EPStructureElement)subLink.getChild());
 		}
 		links.clear();
-	}
+	}*/
 	
 	public void removeStructureRecursively(PortfolioStructure struct){
 		List<PortfolioStructure> children = loadStructureChildren(struct); 

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

@@ -34,7 +34,6 @@ import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
 import org.olat.core.gui.components.link.Link;
 import org.olat.core.gui.components.link.LinkFactory;
-import org.olat.core.gui.components.panel.Panel;
 import org.olat.core.gui.components.velocity.VelocityContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
@@ -353,6 +352,10 @@ public class RepositoryAddController extends BasicController {
 	}
 
 	protected void addFinished(UserRequest ureq) {
+		if(addedEntry != null) {
+			return;
+		}
+		
 		try {
 			DBFactory.getInstance().commitAndCloseSession();
 		} catch (Exception e) {